Merge current mainline tree into linux-omap tree

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	arch/arm/Kconfig
	arch/arm/kernel/asm-offsets.c
	arch/arm/mach-omap2/Makefile
	arch/arm/mach-omap2/board-2430sdp.c
	arch/arm/mach-omap2/board-apollon.c
	arch/arm/mach-omap2/board-h4.c
	arch/arm/mach-omap2/clock.c
	arch/arm/mach-omap2/clock.h
	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/cm-regbits-34xx.h
	arch/arm/mach-omap2/cm.h
	arch/arm/mach-omap2/gpmc.c
	arch/arm/mach-omap2/mux.c
	arch/arm/mach-omap2/pm.c
	arch/arm/mach-omap2/prcm.c
	arch/arm/mach-omap2/prm.h
	arch/arm/mach-omap2/sdrc.h
	arch/arm/mach-omap2/sleep.S
	arch/arm/mach-omap2/sram-fn.S
	arch/arm/mm/Kconfig
	arch/arm/plat-omap/clock.c
	drivers/mmc/host/omap.c
	include/asm-arm/arch-omap/clock.h
	include/asm-arm/arch-omap/mmc.h
	include/asm-arm/arch-omap/mux.h
	include/asm-arm/glue.h
	include/asm-arm/thread_info.h