Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	arch/arm/configs/omap3_pandora_defconfig
	arch/arm/configs/omap_2430sdp_defconfig
	arch/arm/configs/omap_ldp_defconfig
	arch/arm/configs/overo_defconfig
	arch/arm/mach-omap2/board-apollon.c
	arch/arm/mach-omap2/board-omap3beagle.c
	arch/arm/plat-omap/dma.c
	drivers/misc/Makefile
	drivers/mmc/host/omap_hsmmc.c
	drivers/spi/Kconfig
	include/linux/i2c-id.h