| commit | 19fdb9eefb21b72edbc365b838502780c392bad6 | [log] [tgz] |
|---|---|---|
| author | NeilBrown <neilb@suse.de> | Sat May 22 08:31:36 2010 +1000 |
| committer | NeilBrown <neilb@suse.de> | Sat May 22 08:31:36 2010 +1000 |
| tree | deae04c48532d6eab64ed4b0396737bb854b5506 | |
| parent | be6800a73aa2f3dc14744c3b80e676d189789f04 [diff] | |
| parent | 3ff195b011d7decf501a4d55aeed312731094796 [diff] |
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>