Merge branch 'linus' into tracing/kmemtrace
authorIngo Molnar <mingo@elte.hu>
Wed, 31 Dec 2008 07:14:29 +0000 (08:14 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 31 Dec 2008 07:14:29 +0000 (08:14 +0100)
Conflicts:
mm/slub.c


Trivial merge