Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	arch/arm/mach-omap2/irq.c
	arch/arm/plat-omap/devices.c
	arch/arm/plat-omap/dma.c

diff --cc Makefile
Simple merge

diff --cc arch/arm/mach-omap1/devices.c
Simple merge

diff --cc arch/arm/mach-omap2/devices.c
Simple merge

diff --cc arch/arm/mach-omap2/irq.c
Simple merge

diff --cc arch/arm/plat-omap/devices.c
Simple merge

diff --cc arch/arm/plat-omap/include/mach/mmc.h
Simple merge

diff --cc drivers/misc/Kconfig
Simple merge

diff --cc drivers/mmc/host/Kconfig
Simple merge