mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts: drivers/mtd/nand/sh_flctl.c Maxim's patch to initialise sysfs attributes depends on the patch which actually adds sysfs_attr_init().
This commit is contained in:
commit
329f9052db
8065 changed files with 530465 additions and 229136 deletions
|
|
@ -567,7 +567,7 @@ static void jffs2_free_tmp_dnode_info_list(struct rb_root *list)
|
|||
else BUG();
|
||||
}
|
||||
}
|
||||
list->rb_node = NULL;
|
||||
*list = RB_ROOT;
|
||||
}
|
||||
|
||||
static void jffs2_free_full_dirent_list(struct jffs2_full_dirent *fd)
|
||||
|
|
|
|||
Loading…
Reference in a new issue