Merge branch 'for-4.7/core' into for-4.7/drivers
authorJens Axboe <axboe@fb.com>
Tue, 12 Apr 2016 21:46:35 +0000 (15:46 -0600)
committerJens Axboe <axboe@fb.com>
Tue, 12 Apr 2016 21:46:35 +0000 (15:46 -0600)

Trivial merge