diff options
author | Jens Axboe <axboe@fb.com> | 2014-10-01 14:37:25 -0600 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2014-10-01 14:37:25 -0600 |
commit | 7b7b7f7e024460cb7d77f8f96b6eb1a8803f94d9 (patch) | |
tree | 583a7ddbce585533da0077e84c93f449be73316d /drivers/block/nbd.c | |
parent | baf378126b08474de2e2428b16e62a69df0339d9 (diff) | |
parent | 0f1ca65ee50df042051e8fa3a14f73b0c71d45b9 (diff) | |
download | linux-7b7b7f7e024460cb7d77f8f96b6eb1a8803f94d9.tar.bz2 |
Merge branch 'stable/for-jens-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into for-3.18/drivers
Konrad writes:
This pull has two fixes and one cleanup. Nothing earthshattering.
Diffstat (limited to 'drivers/block/nbd.c')
0 files changed, 0 insertions, 0 deletions