Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	arch/arm/Kconfig
	arch/arm/configs/omap3_pandora_defconfig
	arch/arm/mach-omap1/board-h2.c
	arch/arm/mach-omap1/board-h3.c
	arch/arm/mach-omap1/board-innovator.c
	arch/arm/mach-omap1/board-osk.c
	arch/arm/mach-omap1/board-sx1.c
	arch/arm/mach-omap2/Kconfig
	arch/arm/mach-omap2/Makefile
	arch/arm/mach-omap2/board-2430sdp.c
	arch/arm/mach-omap2/board-apollon.c
	arch/arm/mach-omap2/board-generic.c
	arch/arm/mach-omap2/board-h4.c
	arch/arm/mach-omap2/board-ldp.c
	arch/arm/mach-omap2/board-omap3beagle.c
	arch/arm/mach-omap2/board-omap3pandora.c
	arch/arm/mach-omap2/board-overo.c
	arch/arm/mach-omap2/devices.c
	arch/arm/mach-omap2/id.c
	arch/arm/mach-omap2/mux.c
	arch/arm/plat-omap/devices.c
	arch/arm/plat-omap/include/mach/control.h
	arch/arm/plat-omap/include/mach/mux.h
	drivers/i2c/busses/i2c-omap.c
	drivers/i2c/chips/Kconfig
	drivers/i2c/chips/Makefile
	drivers/i2c/chips/menelaus.c
	drivers/input/keyboard/gpio_keys.c
	drivers/input/touchscreen/Makefile
	drivers/leds/Kconfig
	drivers/leds/Makefile
	drivers/misc/Kconfig
	drivers/misc/Makefile
	drivers/mtd/onenand/omap2.c
	drivers/usb/gadget/Kconfig
	drivers/usb/musb/musbhsdma.h
	drivers/usb/otg/Kconfig
	include/linux/i2c/twl4030.h
	sound/soc/codecs/Kconfig
	sound/soc/codecs/Makefile
	sound/soc/codecs/twl4030.c
	sound/soc/codecs/twl4030.h
	sound/soc/omap/Kconfig
	sound/soc/omap/Makefile
	sound/soc/omap/omap3beagle.c
	sound/soc/omap/overo.c