Merge branch 'for-4.2/core' into for-4.2/drivers
authorJens Axboe <axboe@fb.com>
Mon, 1 Jun 2015 20:36:02 +0000 (14:36 -0600)
committerJens Axboe <axboe@fb.com>
Mon, 1 Jun 2015 20:36:02 +0000 (14:36 -0600)

Trivial merge