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

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

Wed, 22 Aug 2012 03:18:28 +0000 (13:18 +1000)

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

Wed, 22 Aug 2012 03:18:28 +0000 (13:18 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 22 Aug 2012 03:18:28 +0000 (13:18 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 22 Aug 2012 03:18:28 +0000 (13:18 +1000)
diff --cc drivers/block/drbd/drbd_main.c
Simple merge
diff --cc fs/bio.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 22 Aug 2012 03:18:28 +0000 (13:18 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 22 Aug 2012 03:18:28 +0000 (13:18 +1000)
		1	2
drivers/block/drbd/drbd_main.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/bio.c	patch \|	diff1 \|	diff2 \|	blob \| history