Merge branch 'for-4.11/block' into for-4.11/linus-merge

author Jens Axboe <axboe@fb.com>

Fri, 17 Feb 2017 21:06:45 +0000 (14:06 -0700)

committer Jens Axboe <axboe@fb.com>

Fri, 17 Feb 2017 21:06:45 +0000 (14:06 -0700)
author Jens Axboe <axboe@fb.com>
Fri, 17 Feb 2017 21:06:45 +0000 (14:06 -0700)
committer Jens Axboe <axboe@fb.com>
Fri, 17 Feb 2017 21:06:45 +0000 (14:06 -0700)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/nvme/host/core.c
Simple merge
diff --cc drivers/nvme/host/nvme.h
Simple merge
diff --cc drivers/nvme/host/pci.c
Simple merge
diff --cc include/linux/blkdev.h
Simple merge
author	Jens Axboe <axboe@fb.com>
	Fri, 17 Feb 2017 21:06:45 +0000 (14:06 -0700)
committer	Jens Axboe <axboe@fb.com>
	Fri, 17 Feb 2017 21:06:45 +0000 (14:06 -0700)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/nvme/host/core.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/nvme/host/nvme.h	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/nvme/host/pci.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/blkdev.h	patch \|	diff1 \|	diff2 \|	blob \| history