Merge commit '3ff195b011d7decf501a4d55aeed312731094796' into for-linus (19fdb9ee) · Commits · 方亚芬 / linux

Commit 19fdb9ee authored May 22, 2010 by

NeilBrown

Merge commit '3ff195b0' 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>

parents be6800a7 3ff195b0

Hide whitespace changes

Inline Side-by-side

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment