Merge branch 'for-linus' into for-4.1/core
authorJens Axboe <[email protected]>
Fri, 13 Mar 2015 14:24:49 +0000 (08:24 -0600)
committerJens Axboe <[email protected]>
Fri, 13 Mar 2015 14:24:49 +0000 (08:24 -0600)

Trivial merge