Merge branch 'for-4.11/block' into for-4.11/linus-merge
authorJens Axboe <axboe@fb.com>
Fri, 17 Feb 2017 21:06:45 +0000 (14:06 -0700)
committerJens Axboe <axboe@fb.com>
Fri, 17 Feb 2017 21:06:45 +0000 (14:06 -0700)
commit6010720da8aab51f33beee63b73cf88016e9b250
treea4c5a7f645998e86a1f49cb05f8e0c4e51448294
parent2fe1e8a7b2f4dcac3fcb07ff06b0ae7396201fd6
parent8a9ae523282f324989850fcf41312b42a2fb9296
Merge branch 'for-4.11/block' into for-4.11/linus-merge

Signed-off-by: Jens Axboe <axboe@fb.com>
MAINTAINERS
drivers/nvme/host/core.c
drivers/nvme/host/nvme.h
drivers/nvme/host/pci.c
include/linux/blkdev.h