Merge current mainline tree into linux-omap tree
Merge branches 'master' and 'linus'
Conflicts:
drivers/usb/gadget/omap_udc.c
drivers/usb/musb/Kconfig
drivers/usb/musb/Makefile
drivers/usb/musb/cppi_dma.c
drivers/usb/musb/davinci.c
drivers/usb/musb/musb_core.c
drivers/usb/musb/musb_core.h
drivers/usb/musb/musb_debug.h
drivers/usb/musb/musb_gadget.c
drivers/usb/musb/musb_gadget_ep0.c
drivers/usb/musb/musb_host.c
drivers/usb/musb/musbhsdma.c
drivers/usb/musb/omap2430.c
drivers/usb/musb/omap2430.h
drivers/usb/musb/tusb6010.c
drivers/usb/musb/tusb6010_omap.c
15 files changed: