Merge branch 'for-4.2/core' into for-4.2/drivers
authorJens Axboe <axboe@fb.com>
Fri, 5 Jun 2015 16:58:28 +0000 (10:58 -0600)
committerJens Axboe <axboe@fb.com>
Fri, 5 Jun 2015 16:58:28 +0000 (10:58 -0600)

Trivial merge