From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 15 Aug 2008 15:07:34 +0000 (+0200)
Subject: Merge branch 'linus' into x86/tracehook
X-Git-Tag: v2.6.28-rc1~734^2~1^2~2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=04197c83b3e05546d1003cfa3ff43f1639c0057f;p=linux-2.6-omap-h63xx.git

Merge branch 'linus' into x86/tracehook

Conflicts:
	arch/x86/Kconfig

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

04197c83b3e05546d1003cfa3ff43f1639c0057f
diff --cc arch/x86/Kconfig
index f463a8a3b21,ac2fb0641a0..2206787b115
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -30,7 -29,7 +29,8 @@@ config X8
  	select HAVE_FTRACE
  	select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64)
  	select HAVE_ARCH_KGDB if !X86_VOYAGER
 +	select HAVE_ARCH_TRACEHOOK
+ 	select HAVE_GENERIC_DMA_COHERENT if X86_32
  	select HAVE_EFFICIENT_UNALIGNED_ACCESS
  
  config ARCH_DEFCONFIG