review.tizen.org Git - platform/kernel/linux-rpi.git/commit

projects / platform / kernel / linux-rpi.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 7a51cff 6a94cb7)

author	Ingo Molnar <mingo@elte.hu>
	Wed, 31 Dec 2008 07:14:29 +0000 (08:14 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Wed, 31 Dec 2008 07:14:29 +0000 (08:14 +0100)
commit	5fdf7e5975a0b0f6a0370655612c5dca3fd6311b
tree	639c536e818c6ace974aa285ba94576df0353b01	tree \| snapshot
parent	7a51cffbd10886c0557677dd916c090097c691ef	commit \| diff
parent	6a94cb73064c952255336cc57731904174b2c58f	commit \| diff

Merge branch 'linus' into tracing/kmemtrace

Conflicts:
mm/slub.c

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
init/main.c	diff1 \|	diff2 \|	blob \| history
lib/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
mm/Makefile	diff1 \|	diff2 \|	blob \| history
mm/slab.c	diff1 \|	diff2 \|	blob \| history
mm/slub.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel;