Merge branch 'master' into for-3.19/drivers
authorJens Axboe <axboe@fb.com>
Wed, 19 Nov 2014 02:43:46 +0000 (19:43 -0700)
committerJens Axboe <axboe@fb.com>
Wed, 19 Nov 2014 02:43:46 +0000 (19:43 -0700)
commitb3521729769ec71567a2e32a38609f87e781e41b
tree66a8494968706420c3eb043caa5868702d440d18
parent139768895309c6c1d6913e909e9c9422f81a1640
parentfc14f9c1272f62c3e8d01300f52467c0d9af50f9
Merge branch 'master' into for-3.19/drivers
block/blk-mq.c
drivers/block/null_blk.c
drivers/scsi/scsi_lib.c
include/linux/blkdev.h