Merge branch 'linus' into tracing/kmemtrace2
authorIngo Molnar <mingo@elte.hu>
Tue, 6 Jan 2009 08:53:05 +0000 (09:53 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 6 Jan 2009 08:53:05 +0000 (09:53 +0100)
commit3d7a96f5a485b7d06c2379f343d7312af89ec9e2
tree5f097f68eb0f9fd3fa4a10f38672e300e9127b10
parent723cbe0775514853c22dc45005af59c360916af1
parent238c6d54830c624f34ac9cf123ac04aebfca5013
Merge branch 'linus' into tracing/kmemtrace2
MAINTAINERS
init/main.c
kernel/trace/trace.h
kernel/trace/trace_functions_graph.c
mm/slab.c
mm/slub.c