Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	arch/arm/plat-omap/Makefile
	arch/arm/plat-omap/gpio.c
	drivers/i2c/busses/i2c-omap.c
	include/asm-arm/arch-omap/dsp_common.h

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
index f94e22a41c3cea3f24e4f3ce1a0c10551d4d33e8,b08a259e21dc2e32c027c36a033f216f73a50ef9..3ec3d6ab4cc12f5aefff92088a05723578f8e1cc
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -194,9 -189,9 +194,9 @@@ SUBARCH := ar
  # Alternatively CROSS_COMPILE can be set in the environment.
  # Default value for CROSS_COMPILE is not to prefix executables
  # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile
- 
+ export KBUILD_BUILDHOST := $(SUBARCH)
  ARCH          ?= $(SUBARCH)
 -CROSS_COMPILE ?=
 +CROSS_COMPILE ?= arm-linux-
  
  # Architecture as present in compile.h
  UTS_MACHINE   := $(ARCH)

diff --cc arch/arm/mm/proc-xscale.S
Simple merge

diff --cc drivers/hwmon/Kconfig
Simple merge

diff --cc drivers/input/touchscreen/ads7846.c
Simple merge

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

diff --cc drivers/rtc/Kconfig
Simple merge