Merge tag 'v4.3-rc4' into for-4.4/core
authorJens Axboe <axboe@fb.com>
Fri, 9 Oct 2015 16:08:39 +0000 (10:08 -0600)
committerJens Axboe <axboe@fb.com>
Fri, 9 Oct 2015 16:08:39 +0000 (10:08 -0600)
Linux 4.3-rc4

Pulling in v4.3-rc4 to avoid conflicts with NVMe fixes that have gone
in since for-4.4/core was based.

1  2 
block/blk-mq.c

diff --cc block/blk-mq.c
Simple merge