Merge branch 'tracing/kmemtrace' into tracing/kmemtrace2
authorIngo Molnar <mingo@elte.hu>
Wed, 31 Dec 2008 07:19:48 +0000 (08:19 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 31 Dec 2008 07:19:48 +0000 (08:19 +0100)
commit818fa7f3908c7bd6c0045e9d94dc23a899ef6144
treead3435c3f57c8222ad61709b716168932f13be6c
parent3fd4bc015ef879a7d2b955ce97fb125e3a51ba7e
parent5fdf7e5975a0b0f6a0370655612c5dca3fd6311b
Merge branch 'tracing/kmemtrace' into tracing/kmemtrace2
init/main.c
lib/Kconfig.debug
mm/slab.c
mm/slub.c