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

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

Fri, 21 Sep 2012 02:05:14 +0000 (12:05 +1000)

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

Fri, 21 Sep 2012 02:05:14 +0000 (12:05 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 21 Sep 2012 02:05:14 +0000 (12:05 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 21 Sep 2012 02:05:14 +0000 (12:05 +1000)
diff --cc MAINTAINERS
Simple merge
diff --cc block/blk-core.c
Simple merge
diff --cc block/ioctl.c
Simple merge
diff --cc drivers/md/md.c
Simple merge
diff --cc drivers/target/target_core_iblock.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 21 Sep 2012 02:05:14 +0000 (12:05 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 21 Sep 2012 02:05:14 +0000 (12:05 +1000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
block/blk-core.c	patch \|	diff1 \|	diff2 \|	blob \| history
block/ioctl.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/md/md.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/target/target_core_iblock.c	patch \|	diff1 \|	diff2 \|	blob \| history