Merge remote-tracking branch 'md/for-next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Mon, 17 Sep 2012 05:25:42 +0000 (15:25 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Mon, 17 Sep 2012 05:25:42 +0000 (15:25 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 17 Sep 2012 05:25:42 +0000 (15:25 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 17 Sep 2012 05:25:42 +0000 (15:25 +1000)
diff --cc drivers/md/md.c
Simple merge
diff --cc fs/bio.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 17 Sep 2012 05:25:42 +0000 (15:25 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 17 Sep 2012 05:25:42 +0000 (15:25 +1000)
		1	2
drivers/md/md.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/bio.c	patch \|	diff1 \|	diff2 \|	blob \| history