Merge branch 'stable/for-jens-3.18' of git://git.kernel.org/pub/scm/linux/kernel...
authorJens Axboe <axboe@fb.com>
Wed, 1 Oct 2014 20:37:25 +0000 (14:37 -0600)
committerJens Axboe <axboe@fb.com>
Wed, 1 Oct 2014 20:37:25 +0000 (14:37 -0600)
commit7b7b7f7e024460cb7d77f8f96b6eb1a8803f94d9
tree583a7ddbce585533da0077e84c93f449be73316d
parentbaf378126b08474de2e2428b16e62a69df0339d9
parent0f1ca65ee50df042051e8fa3a14f73b0c71d45b9
Merge branch 'stable/for-jens-3.18' of git://git./linux/kernel/git/konrad/xen into for-3.18/drivers

Konrad writes:

This pull has two fixes and one cleanup. Nothing earthshattering.