| commit | a1e8fad5900fa94adb500c6e0dfd60a307f7a3c9 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jan 10 08:38:01 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jan 10 08:38:01 2011 -0800 |
| tree | c619277e587a99c90e76a1e7b63746af4d959d72 | |
| parent | e3166331a3288dd7184548896a1c7ab682f0dbe8 [diff] | |
| parent | a45b0616e7ee9db4c1b2b9a4a79a974325fa9bf3 [diff] |
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 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