From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 6 Mar 2009 15:44:14 +0000 (+0100)
Subject: Merge branch 'x86/core' into tracing/textedit
X-Git-Tag: v2.6.30-rc1~2^2~55^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0ef03985130287c6c84ebe69416cf790e6cc00e;p=pandora-kernel.git

Merge branch 'x86/core' into tracing/textedit

Conflicts:
	arch/x86/Kconfig
	block/blktrace.c
	kernel/irq/handle.c

Semantic conflict:
	kernel/trace/blktrace.c

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

f0ef03985130287c6c84ebe69416cf790e6cc00e
Reading git-diff-tree failed