Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	arch/arm/Kconfig

diff --cc Makefile
Simple merge

diff --cc arch/arm/Kconfig
index 8bab719b2eb01ed4d49cce6cf00057526f229106,a04f507e7f2ca94f1b959d0e03dac7f0a3c73575..a2f6023407163f78b8e307bc1ac4de7df78a130b
--- 1/arch/arm/Kconfig
--- 2/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"