Merge branch 'stable/for-jens-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorJens Axboe <axboe@fb.com>
Sat, 27 Jun 2015 17:47:07 +0000 (11:47 -0600)
committerJens Axboe <axboe@fb.com>
Sat, 27 Jun 2015 17:47:07 +0000 (11:47 -0600)

Trivial merge