Merge branch 'slab/tracing' into slab/for-linus
authorPekka Enberg <penberg@kernel.org>
Wed, 3 Oct 2012 06:57:17 +0000 (09:57 +0300)
committerPekka Enberg <penberg@kernel.org>
Wed, 3 Oct 2012 06:57:17 +0000 (09:57 +0300)
commite2087be35a8ed101c1e748ef688c889419c69829
tree9ad1039f9a8b5b887f0007571bd2c8ff63d9536c
parentf4178cdddd4cb860a17f363fe13264fff03da7f2
parentdffa3f985047979ace185e253da89cabda3f7b31
Merge branch 'slab/tracing' into slab/for-linus
mm/slab.c
mm/slob.c