From: NeilBrown <neilb@suse.de>
Date: Fri, 21 May 2010 22:31:36 +0000 (+1000)
Subject: Merge commit '3ff195b011d7decf501a4d55aeed312731094796' into for-linus
X-Git-Tag: v2.6.35-rc1~440^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19fdb9eefb21b72edbc365b838502780c392bad6;p=pandora-kernel.git

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>
---

19fdb9eefb21b72edbc365b838502780c392bad6
Reading git-diff-tree failed