Merge commit '3ff195b011d7decf501a4d55aeed312731094796' 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)
commit19fdb9eefb21b72edbc365b838502780c392bad6
treedeae04c48532d6eab64ed4b0396737bb854b5506
parentbe6800a73aa2f3dc14744c3b80e676d189789f04
parent3ff195b011d7decf501a4d55aeed312731094796
Merge commit '3ff195b011d7decf501a4d55aeed312731094796' 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