Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	drivers/w1/masters/omap_hdq.c
	drivers/w1/slaves/Kconfig
	drivers/w1/slaves/w1_bq27000.c

diff --cc Makefile
Simple merge

diff --cc drivers/hwmon/Kconfig
Simple merge

diff --cc drivers/hwmon/Makefile
Simple merge

diff --cc drivers/misc/Kconfig
Simple merge

diff --cc drivers/misc/Makefile
Simple merge

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

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

diff --cc drivers/usb/musb/omap2430.c
Simple merge