| commit | a1e8fad5900fa94adb500c6e0dfd60a307f7a3c9 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Mon, 10 Jan 2011 16:38:01 +0000 (10 08:38 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Mon, 10 Jan 2011 16:38:01 +0000 (10 08:38 -0800) | ||
| tree | c619277e587a99c90e76a1e7b63746af4d959d72 | treesnapshot (tar.gz zip) |
| parent | e3166331a3288dd7184548896a1c7ab682f0dbe8 | commitdiff |
| parent | a45b0616e7ee9db4c1b2b9a4a79a974325fa9bf3 | commitdiff |
Merge branch 'for-linus' of git://git./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 a crash during slabinfo -v
tracing/slab: Move kmalloc tracepoint out of inline code
slub: Fix slub_lock down/up imbalance
slub: Fix build breakage in Documentation/vm
slub tracing: move trace calls out of always inlined functions to reduce kernel code size
slub: move slabinfo.c to tools/slub/slabinfo.c
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
slub: Fix a crash during slabinfo -v
tracing/slab: Move kmalloc tracepoint out of inline code
slub: Fix slub_lock down/up imbalance
slub: Fix build breakage in Documentation/vm
slub tracing: move trace calls out of always inlined functions to reduce kernel code size
slub: move slabinfo.c to tools/slub/slabinfo.c
| mm/slab.c | diff1 | diff2 | blobhistory |
| mm/slub.c | diff1 | diff2 | blobhistory |