Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	arch/arm/configs/omap3_beagle_defconfig
	arch/arm/configs/omap_ldp_defconfig
	arch/arm/configs/overo_defconfig
	arch/arm/include/asm/mach/map.h
	arch/arm/include/asm/system.h
	arch/arm/kernel/setup.c
	arch/arm/mach-omap1/board-h3.c
	arch/arm/mach-omap1/clock.h
	arch/arm/mach-omap2/Kconfig
	arch/arm/mach-omap2/Makefile
	arch/arm/mach-omap2/board-2430sdp.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-overo.c
	arch/arm/mach-omap2/clock.c
	arch/arm/mach-omap2/clock24xx.c
	arch/arm/mach-omap2/clock24xx.h
	arch/arm/mach-omap2/clock34xx.c
	arch/arm/mach-omap2/clock34xx.h
	arch/arm/mach-omap2/clockdomain.c
	arch/arm/mach-omap2/clockdomains.h
	arch/arm/mach-omap2/cm.h
	arch/arm/mach-omap2/devices.c
	arch/arm/mach-omap2/gpmc.c
	arch/arm/mach-omap2/id.c
	arch/arm/mach-omap2/io.c
	arch/arm/mach-omap2/irq.c
	arch/arm/mach-omap2/memory.c
	arch/arm/mach-omap2/memory.h
	arch/arm/mach-omap2/mux.c
	arch/arm/mach-omap2/pm.c
	arch/arm/mach-omap2/powerdomains.h
	arch/arm/mach-omap2/powerdomains34xx.h
	arch/arm/mach-omap2/prm.h
	arch/arm/mach-omap2/serial.c
	arch/arm/plat-omap/Kconfig
	arch/arm/plat-omap/common.c
	arch/arm/plat-omap/devices.c
	arch/arm/plat-omap/include/mach/board.h
	arch/arm/plat-omap/include/mach/clock.h
	arch/arm/plat-omap/include/mach/clockdomain.h
	arch/arm/plat-omap/include/mach/common.h
	arch/arm/plat-omap/include/mach/cpu.h
	arch/arm/plat-omap/include/mach/entry-macro.S
	arch/arm/plat-omap/include/mach/fpga.h
	arch/arm/plat-omap/include/mach/gpmc.h
	arch/arm/plat-omap/include/mach/hardware.h
	arch/arm/plat-omap/include/mach/io.h
	arch/arm/plat-omap/include/mach/irqs.h
	arch/arm/plat-omap/include/mach/onenand.h
	arch/arm/plat-omap/include/mach/pm.h
	arch/arm/plat-omap/include/mach/powerdomain.h
	arch/arm/plat-omap/include/mach/sdrc.h
	arch/arm/plat-omap/sram.c
	drivers/gpio/Kconfig
	drivers/gpio/gpiolib.c
	drivers/i2c/busses/i2c-omap.c
	drivers/i2c/chips/Makefile
	drivers/i2c/i2c-core.c
	drivers/media/video/Kconfig
	drivers/mfd/Kconfig
	drivers/mfd/Makefile
	drivers/mfd/twl4030-core.c
	drivers/misc/Kconfig
	drivers/mtd/maps/omap-toto-flash.c
	drivers/mtd/nand/Kconfig
	drivers/mtd/nand/Makefile
	drivers/mtd/onenand/omap2.c
	drivers/net/Kconfig
	drivers/power/bq27x00_battery.c
	drivers/rtc/Kconfig
	drivers/usb/gadget/Kconfig
	drivers/usb/musb/davinci.c
	drivers/video/omap/dispc.h
	include/linux/i2c/twl4030.h
	sound/soc/codecs/Kconfig
	sound/soc/codecs/Makefile
	sound/soc/omap/Kconfig
	sound/soc/omap/Makefile