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

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

Thu, 8 Nov 2012 01:55:00 +0000 (12:55 +1100)

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

Thu, 8 Nov 2012 01:55:00 +0000 (12:55 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 8 Nov 2012 01:55:00 +0000 (12:55 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 8 Nov 2012 01:55:00 +0000 (12:55 +1100)
diff --cc MAINTAINERS
Simple merge
diff --cc block/genhd.c
Simple merge
diff --cc drivers/block/floppy.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 8 Nov 2012 01:55:00 +0000 (12:55 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 8 Nov 2012 01:55:00 +0000 (12:55 +1100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
block/genhd.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/block/floppy.c	patch \|	diff1 \|	diff2 \|	blob \| history