Merge remote-tracking branch 'device-mapper/for-next'

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

Fri, 30 May 2014 02:26:45 +0000 (12:26 +1000)

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

Fri, 30 May 2014 02:26:45 +0000 (12:26 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 02:26:45 +0000 (12:26 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 02:26:45 +0000 (12:26 +1000)
diff --cc block/bio.c
Simple merge
diff --cc drivers/md/dm.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 30 May 2014 02:26:45 +0000 (12:26 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 30 May 2014 02:26:45 +0000 (12:26 +1000)
		1	2
block/bio.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/md/dm.c	patch \|	diff1 \|	diff2 \|	blob \| history