Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

diff --cc Makefile
Simple merge

diff --cc drivers/input/keyboard/omap-keypad.c
Simple merge

diff --cc drivers/mtd/maps/Kconfig
Simple merge

diff --cc drivers/usb/host/ehci-hcd.c
Simple merge