summaryrefslogtreecommitdiff
path: root/drivers/ide/ide-disk.c
diff options
context:
space:
mode:
authorJens Axboe <axboe@fb.com>2014-10-02 00:37:25 +0400
committerJens Axboe <axboe@fb.com>2014-10-02 00:37:25 +0400
commit7b7b7f7e024460cb7d77f8f96b6eb1a8803f94d9 (patch)
tree583a7ddbce585533da0077e84c93f449be73316d /drivers/ide/ide-disk.c
parentbaf378126b08474de2e2428b16e62a69df0339d9 (diff)
parent0f1ca65ee50df042051e8fa3a14f73b0c71d45b9 (diff)
downloadlinux-7b7b7f7e024460cb7d77f8f96b6eb1a8803f94d9.tar.xz
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/ide/ide-disk.c')
0 files changed, 0 insertions, 0 deletions