From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 14 Jul 2008 14:11:52 +0000 (+0200)
Subject: Merge branch 'auto-ftrace-next' into tracing/for-linus
X-Git-Tag: v2.6.27-rc1~1102^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5806b81ac1c0c52665b91723fd4146a4f86e386b;p=pandora-kernel.git

Merge branch 'auto-ftrace-next' into tracing/for-linus

Conflicts:

	arch/x86/kernel/entry_32.S
	arch/x86/kernel/process_32.c
	arch/x86/kernel/process_64.c
	arch/x86/lib/Makefile
	include/asm-x86/irqflags.h
	kernel/Makefile
	kernel/sched.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

5806b81ac1c0c52665b91723fd4146a4f86e386b
Reading git-diff-tree failed