Merge branch 'for-4.12/block' into for-next
authorJens Axboe <axboe@fb.com>
Fri, 21 Apr 2017 17:14:50 +0000 (11:14 -0600)
committerJens Axboe <axboe@fb.com>
Fri, 21 Apr 2017 17:14:50 +0000 (11:14 -0600)
commitd13dbb68f37f3715ce619357743895529a442faa
tree1eb24a73e98cf398ebf58df101e7a409ab4bfe38
parent160b2f807c6c4f050872f634b70b9508d8feb300
parentf8a05a1d01d9bb8aba78339d1e4b559e5db3b716
Merge branch 'for-4.12/block' into for-next
drivers/scsi/lpfc/lpfc_nvmet.c