summaryrefslogtreecommitdiffstats
path: root/drivers/block/cciss.c
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2013-05-01 09:23:05 +0200
committerJens Axboe <axboe@kernel.dk>2013-05-01 09:23:05 +0200
commitf50efd2fdbd9b35b11f5778ed85beb764184bda9 (patch)
treeed92b40995d60136fb387d210886e4aae2c37231 /drivers/block/cciss.c
parentcciss: bug fix to prevent cciss from loading in kdump crash kernel (diff)
parentbcache: Use bd_link_disk_holder() (diff)
downloadlinux-f50efd2fdbd9b35b11f5778ed85beb764184bda9.tar.xz
linux-f50efd2fdbd9b35b11f5778ed85beb764184bda9.zip
Merge branch 'bcache-for-upstream' of http://evilpiepirate.org/git/linux-bcache into for-3.10/drivers
Kent writes: Hey Jens, this is everything I've got ready for 3.10 - there's _still_ one more bug I'm trying to track down. Andrew - I've got patches that rip out the pkey() and pbtree() macros, but they're somewhat tied up with some other nontrivial refactorings so I think I'm going to wait a bit on those.
Diffstat (limited to 'drivers/block/cciss.c')
0 files changed, 0 insertions, 0 deletions