Merge branch 'master' into for-3.19/drivers

author Jens Axboe <axboe@fb.com>

Wed, 19 Nov 2014 02:43:46 +0000 (19:43 -0700)

committer Jens Axboe <axboe@fb.com>

Wed, 19 Nov 2014 02:43:46 +0000 (19:43 -0700)
author Jens Axboe <axboe@fb.com>
Wed, 19 Nov 2014 02:43:46 +0000 (19:43 -0700)
committer Jens Axboe <axboe@fb.com>
Wed, 19 Nov 2014 02:43:46 +0000 (19:43 -0700)
diff --cc block/blk-mq.c
Simple merge
diff --cc drivers/block/null_blk.c
Simple merge
diff --cc drivers/scsi/scsi_lib.c
Simple merge
diff --cc include/linux/blkdev.h
Simple merge
author	Jens Axboe <axboe@fb.com>
	Wed, 19 Nov 2014 02:43:46 +0000 (19:43 -0700)
committer	Jens Axboe <axboe@fb.com>
	Wed, 19 Nov 2014 02:43:46 +0000 (19:43 -0700)
		1	2
block/blk-mq.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/block/null_blk.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/scsi/scsi_lib.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/blkdev.h	patch \|	diff1 \|	diff2 \|	blob \| history