Merge branches 'master' and 'linus'

Conflicts:

	arch/arm/Makefile
	arch/arm/mach-omap1/board-h2.c
	arch/arm/mach-omap1/board-h3.c
	arch/arm/mach-omap1/board-nokia770.c
	arch/arm/mach-omap1/board-palmte.c
	arch/arm/mach-omap1/board-sx1.c
	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/clock24xx.c
	arch/arm/mach-omap2/devices.c
	arch/arm/mach-omap2/id.c
	arch/arm/mach-omap2/io.c
	arch/arm/mach-omap2/memory.c
	arch/arm/mach-omap2/pm.c
	arch/arm/mach-omap2/sleep.S
	arch/arm/plat-omap/devices.c
	drivers/i2c/chips/menelaus.c
	drivers/input/keyboard/omap-keypad.c
	drivers/watchdog/omap_wdt.c
	include/asm-arm/arch-omap/board-2430sdp.h
	include/asm-arm/arch-omap/board-apollon.h
	include/asm-arm/arch-omap/board-h4.h
	include/asm-arm/arch-omap/board-nokia.h
	include/asm-arm/arch-omap/board.h
	include/asm-arm/arch-omap/clock.h
	include/asm-arm/arch-omap/common.h
	include/asm-arm/arch-omap/control.h
	include/asm-arm/arch-omap/cpu.h
	include/asm-arm/arch-omap/debug-macro.S
	include/asm-arm/arch-omap/dsp_common.h
	include/asm-arm/arch-omap/entry-macro.S
	include/asm-arm/arch-omap/gpio-switch.h
	include/asm-arm/arch-omap/gpio.h
	include/asm-arm/arch-omap/gpmc.h
	include/asm-arm/arch-omap/hardware.h
	include/asm-arm/arch-omap/io.h
	include/asm-arm/arch-omap/irqs.h
	include/asm-arm/arch-omap/mailbox.h
	include/asm-arm/arch-omap/mcbsp.h
	include/asm-arm/arch-omap/memory.h
	include/asm-arm/arch-omap/mmc.h
	include/asm-arm/arch-omap/mux.h
	include/asm-arm/arch-omap/omap-alsa.h
	include/asm-arm/arch-omap/omap1510.h
	include/asm-arm/arch-omap/omap16xx.h
	include/asm-arm/arch-omap/omap24xx.h
	include/asm-arm/arch-omap/omap34xx.h
	include/asm-arm/arch-omap/omapfb.h
	include/asm-arm/arch-omap/onenand.h
	include/asm-arm/arch-omap/pm.h
	include/asm-arm/arch-omap/prcm.h
	include/asm-arm/arch-omap/sdrc.h
	include/asm-arm/arch-omap/serial.h
	include/asm-arm/arch-omap/sram.h
	include/asm-arm/arch-omap/system.h
	include/asm-arm/arch-omap/timex.h
	include/asm-arm/arch-omap/usb.h
	include/asm-arm/arch-omap/vmalloc.h