Merge branch 'stable/for-jens-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorJens Axboe <axboe@fb.com>
Wed, 29 Jun 2016 19:15:19 +0000 (13:15 -0600)
committerJens Axboe <axboe@fb.com>
Wed, 29 Jun 2016 19:15:19 +0000 (13:15 -0600)

Trivial merge