Merge branch 'for-4.11/block' into for-next
authorJens Axboe <axboe@fb.com>
Tue, 31 Jan 2017 15:33:10 +0000 (08:33 -0700)
committerJens Axboe <axboe@fb.com>
Tue, 31 Jan 2017 15:33:10 +0000 (08:33 -0700)
commitf19fa1df4cd2e5695b6f460d18b5b55cd6e70248
tree3d12be736c18882af053f3e45d39c53f0db30c0f
parent2b2cda014e592de7b6b097b590e92c339240f2c9
parent9a69b0ed6257ae5e71c99bf21ce53f98c558476a
Merge branch 'for-4.11/block' into for-next
drivers/nvme/host/core.c
drivers/nvme/host/nvme.h