Merge branch 'for-3.16/core' into for-3.16/drivers
authorJens Axboe <axboe@fb.com>
Wed, 28 May 2014 15:50:26 +0000 (09:50 -0600)
committerJens Axboe <axboe@fb.com>
Wed, 28 May 2014 15:50:26 +0000 (09:50 -0600)
commit6178976500ae61fa7b12ebb2d3de816dc9396388
tree143df1479f56458801b676d038e6a7157a472981
parent6314a108ec19aefa5160535b2bfe1ca9c38efe37
parentd852564f8c88b0604490234fdeeb6fb47e4bcc7a
Merge branch 'for-3.16/core' into for-3.16/drivers

mtip32xx uses blk_mq_alloc_reserved_request(), so pull in the
core changes so we have a properly merged end result.

Signed-off-by: Jens Axboe <axboe@fb.com>
drivers/block/mtip32xx/mtip32xx.c
drivers/block/null_blk.c
drivers/block/skd_main.c
include/linux/blkdev.h