Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	drivers/usb/musb/musb_core.c

diff --cc Makefile
Simple merge

diff --cc drivers/usb/gadget/omap_udc.c
Simple merge

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