diff options
| author | Jens Axboe <axboe@kernel.dk> | 2013-05-01 11:23:05 +0400 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2013-05-01 11:23:05 +0400 |
| commit | f50efd2fdbd9b35b11f5778ed85beb764184bda9 (patch) | |
| tree | ed92b40995d60136fb387d210886e4aae2c37231 /include/trace | |
| parent | 0821e904057505c7e25d72e1a282105d023b26c9 (diff) | |
| parent | ee66850642efda91d04179cae2414310675a1f73 (diff) | |
| download | linux-f50efd2fdbd9b35b11f5778ed85beb764184bda9.tar.xz | |
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 'include/trace')
0 files changed, 0 insertions, 0 deletions