projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 67e6da7 5698bd7)
Merge 3.6-rc6 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 17 Sep 2012 03:42:46 +0000 (20:42 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 17 Sep 2012 03:42:46 +0000 (20:42 -0700)
commit2bcb132c693566bcb8208cc7ce66b72a4f852ecf
tree6fc4f05ce18140d86aa78a10380a610734aeaef9tree | snapshot
parent67e6da702753dac8f0540209dded80a0c4e60d81commit | diff
parent5698bd757d55b1bb87edd1a9744ab09c142abfc2commit | diff
Merge 3.6-rc6 into usb-next

This resolves the merge problems with:
drivers/usb/dwc3/gadget.c
drivers/usb/musb/tusb6010.c
that had been seen in linux-next.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
17 files changed:
Documentation/feature-removal-schedule.txt diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-omap3evm.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/omap_hwmod_44xx_data.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/twl-common.c diff1 | diff2 | blob | history
drivers/usb/core/quirks.c diff1 | diff2 | blob | history
drivers/usb/dwc3/core.c diff1 | diff2 | blob | history
drivers/usb/dwc3/ep0.c diff1 | diff2 | blob | history
drivers/usb/dwc3/gadget.c diff1 | diff2 | blob | history
drivers/usb/gadget/at91_udc.c diff1 | diff2 | blob | history
drivers/usb/gadget/dummy_hcd.c diff1 | diff2 | blob | history
drivers/usb/host/xhci-hub.c diff1 | diff2 | blob | history
drivers/usb/host/xhci.c diff1 | diff2 | blob | history
drivers/usb/host/xhci.h diff1 | diff2 | blob | history
drivers/usb/musb/musb_host.c diff1 | diff2 | blob | history
drivers/usb/musb/musbhsdma.c diff1 | diff2 | blob | history
drivers/usb/serial/ftdi_sio.c diff1 | diff2 | blob | history
drivers/usb/serial/option.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.