From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 1 Apr 2009 19:54:19 +0000 (+0200)
Subject: Merge branch 'tracing/core-v2' into tracing-for-linus
X-Git-Tag: v2.6.30-rc1~203^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8302294f43250dc337108c51882a6007f2b1e2e0;p=pandora-kernel.git

Merge branch 'tracing/core-v2' into tracing-for-linus

Conflicts:
	include/linux/slub_def.h
	lib/Kconfig.debug
	mm/slob.c
	mm/slub.c
---

8302294f43250dc337108c51882a6007f2b1e2e0
Reading git-diff-tree failed