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

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

Tue, 18 Sep 2012 02:41:06 +0000 (12:41 +1000)

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

Tue, 18 Sep 2012 02:41:06 +0000 (12:41 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 18 Sep 2012 02:41:06 +0000 (12:41 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 18 Sep 2012 02:41:06 +0000 (12:41 +1000)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/target/target_core_iblock.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 18 Sep 2012 02:41:06 +0000 (12:41 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 18 Sep 2012 02:41:06 +0000 (12:41 +1000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/target/target_core_iblock.c	patch \|	diff1 \|	diff2 \|	blob \| history