tree c619277e587a99c90e76a1e7b63746af4d959d72
parent e3166331a3288dd7184548896a1c7ab682f0dbe8
parent a45b0616e7ee9db4c1b2b9a4a79a974325fa9bf3
author Linus Torvalds <torvalds@linux-foundation.org> 1294677481 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1294677481 -0800

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