diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-14 13:06:37 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-14 13:06:37 -0800 |
commit | 2744b8889cd6d4a730634400d337bee07d1702bc (patch) | |
tree | 91557775e3516d1df89141d588e9c7697f3583bb /kernel/perf_event.c | |
parent | 1ca7318cacdac5262492149cf46abc06c95693fa (diff) | |
parent | 68cee4f118c21a1c67e5764a91d766661db5b360 (diff) | |
download | linux-2744b8889cd6d4a730634400d337bee07d1702bc.tar.bz2 |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
slub: Fix slub_lock down/up imbalance
Diffstat (limited to 'kernel/perf_event.c')
0 files changed, 0 insertions, 0 deletions