diff options
author | 2013-05-01 09:23:05 +0200 | |
---|---|---|
committer | 2013-05-01 09:23:05 +0200 | |
commit | f50efd2fdbd9b35b11f5778ed85beb764184bda9 (patch) | |
tree | ed92b40995d60136fb387d210886e4aae2c37231 /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | cciss: bug fix to prevent cciss from loading in kdump crash kernel (diff) | |
parent | bcache: Use bd_link_disk_holder() (diff) | |
download | wireguard-linux-f50efd2fdbd9b35b11f5778ed85beb764184bda9.tar.xz wireguard-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 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions