tree 9ad1039f9a8b5b887f0007571bd2c8ff63d9536c
parent f4178cdddd4cb860a17f363fe13264fff03da7f2
parent dffa3f985047979ace185e253da89cabda3f7b31
author Pekka Enberg <penberg@kernel.org> 1349247437 +0300
committer Pekka Enberg <penberg@kernel.org> 1349247437 +0300

Merge branch 'slab/tracing' into slab/for-linus