Merge branch 'bcache-for-upstream' of http://evilpiepirate.org/git/linux-bcache into...
authorJens Axboe <axboe@kernel.dk>
Wed, 1 May 2013 07:23:05 +0000 (09:23 +0200)
committerJens Axboe <axboe@kernel.dk>
Wed, 1 May 2013 07:23:05 +0000 (09:23 +0200)
commitf50efd2fdbd9b35b11f5778ed85beb764184bda9
treeed92b40995d60136fb387d210886e4aae2c37231
parent0821e904057505c7e25d72e1a282105d023b26c9
parentee66850642efda91d04179cae2414310675a1f73
Merge branch 'bcache-for-upstream' of 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.