]> git.baikalelectronics.ru Git - kernel.git/commit
Merge commit '9bb064007df0539920840fab6e9dbaf01a243a6b' into for-linus
authorNeilBrown <neilb@suse.de>
Fri, 21 May 2010 22:31:36 +0000 (08:31 +1000)
committerNeilBrown <neilb@suse.de>
Fri, 21 May 2010 22:31:36 +0000 (08:31 +1000)
commitc20d578ea079a4cfb0ffb2b9fa0b7f2c757ac542
treedeae04c48532d6eab64ed4b0396737bb854b5506
parent858f53f545a03c950f60414b87f367ae2319da91
parent9bb064007df0539920840fab6e9dbaf01a243a6b
Merge commit '9bb064007df0539920840fab6e9dbaf01a243a6b' into for-linus

Conflicts:
drivers/md/md.c

- Resolved conflict in md_update_sb
- Added extra 'NULL' arg to new instance of sysfs_get_dirent.

Signed-off-by: NeilBrown <neilb@suse.de>
drivers/md/bitmap.c
drivers/md/faulty.c
drivers/md/linear.c
drivers/md/md.c
drivers/md/multipath.c
drivers/md/raid0.c
drivers/md/raid1.c
drivers/md/raid10.c
drivers/md/raid5.c