Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	sound/soc/Kconfig
	sound/soc/Makefile

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mm/Kconfig
Simple merge

diff --cc drivers/media/video/Kconfig
index f888f84e83d7769dc6ee811feb637cbec1442cd9,fe9a4cc141414c18523cb11c1b97dd0138b8c111..2b81bb54d81f6bf2789deaef9578ea68acda71cf
--- 1/drivers/media/video/Kconfig
--- 2/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@@ -697,10 -698,10 +706,12 @@@ source "drivers/media/video/cx88/Kconfi
  
  source "drivers/media/video/cx23885/Kconfig"
  
+ source "drivers/media/video/au0828/Kconfig"
+ 
  source "drivers/media/video/ivtv/Kconfig"
  
 +source drivers/media/video/omap/Kconfig
 +
  config VIDEO_M32R_AR
        tristate "AR devices"
        depends on M32R && VIDEO_V4L1

diff --cc drivers/media/video/Makefile
Simple merge

diff --cc include/linux/i2c-id.h
Simple merge

diff --cc sound/soc/Kconfig
index 52e613e282ca3404dd3421480ec8d88f11417461,a3b51df2bea148293bb5f12b55e47ee42936d45f..18f28ac4bfe82997733df97c1c1eaaf05dc41adb
--- 1/sound/soc/Kconfig
--- 2/sound/soc/Kconfig
+++ b/sound/soc/Kconfig
@@@ -29,7 -29,7 +29,8 @@@ source "sound/soc/pxa/Kconfig
  source "sound/soc/s3c24xx/Kconfig"
  source "sound/soc/sh/Kconfig"
  source "sound/soc/fsl/Kconfig"
+ source "sound/soc/davinci/Kconfig"
 +source "sound/soc/omap/Kconfig"
  
  # Supported codecs
  source "sound/soc/codecs/Kconfig"

diff --cc sound/soc/Makefile
index 148a84dde69ae8179b4699bbe84479ea35ebf46c,e489dbdde45839664cbf44dd408143afce2374e2..782db2127108fd26c19a0bb6bf2ee378cbd4d0ac
--- 1/sound/soc/Makefile
--- 2/sound/soc/Makefile
+++ b/sound/soc/Makefile
@@@ -1,4 -1,4 +1,4 @@@
  snd-soc-core-objs := soc-core.o soc-dapm.o
  
  obj-$(CONFIG_SND_SOC) += snd-soc-core.o
- obj-$(CONFIG_SND_SOC) += codecs/ at91/ pxa/ s3c24xx/ sh/ fsl/ omap/
 -obj-$(CONFIG_SND_SOC) += codecs/ at91/ pxa/ s3c24xx/ sh/ fsl/ davinci/
++obj-$(CONFIG_SND_SOC) += codecs/ at91/ pxa/ s3c24xx/ sh/ fsl/ davinci/ omap/