Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

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

diff --cc drivers/hwmon/Kconfig
Simple merge

diff --cc drivers/hwmon/Makefile
Simple merge

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

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