tree ed92b40995d60136fb387d210886e4aae2c37231
parent 0821e904057505c7e25d72e1a282105d023b26c9
parent ee66850642efda91d04179cae2414310675a1f73
author Jens Axboe <axboe@kernel.dk> 1367392985 +0200
committer Jens Axboe <axboe@kernel.dk> 1367392985 +0200

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.