Merge branch 'for-4.11/block' into for-next
authorJens Axboe <axboe@fb.com>
Mon, 13 Feb 2017 16:37:26 +0000 (09:37 -0700)
committerJens Axboe <axboe@fb.com>
Mon, 13 Feb 2017 16:37:26 +0000 (09:37 -0700)

Trivial merge