Merge branch 'stable/for-jens-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorJens Axboe <axboe@fb.com>
Sun, 31 Jan 2016 05:04:52 +0000 (22:04 -0700)
committerJens Axboe <axboe@fb.com>
Sun, 31 Jan 2016 05:04:52 +0000 (22:04 -0700)

Trivial merge