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)
commit5fdf7e5975a0b0f6a0370655612c5dca3fd6311b
tree639c536e818c6ace974aa285ba94576df0353b01
parent7a51cffbd10886c0557677dd916c090097c691ef
parent6a94cb73064c952255336cc57731904174b2c58f
Merge branch 'linus' into tracing/kmemtrace

Conflicts:
mm/slub.c
MAINTAINERS
init/main.c
lib/Kconfig.debug
mm/Makefile
mm/slab.c
mm/slub.c