From: Tony Lindgren <tony@atomide.com>
Date: Tue, 22 Jan 2008 19:56:40 +0000 (-0800)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.24-omap1~49
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f730397f4c203e29df4becc31e580ca8fb21c5d5;p=linux-2.6-omap-h63xx.git

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	arch/arm/Kconfig
---

f730397f4c203e29df4becc31e580ca8fb21c5d5
diff --cc arch/arm/Kconfig
index 8bab719b2eb,a04f507e7f2..a2f60234071
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -1085,11 -1072,8 +1085,13 @@@ source "drivers/rtc/Kconfig
  
  source "drivers/dma/Kconfig"
  
+ source "drivers/dca/Kconfig"
+ 
 +if ARCH_OMAP
 +source "drivers/cbus/Kconfig"
 +source "drivers/dsp/dspgateway/Kconfig"
 +endif
 +
  endmenu
  
  source "fs/Kconfig"