Greg Kroah-Hartman 2bcb132c69 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>

2012-09-16 20:42:46 -07:00

..

core.c

Merge 3.6-rc6 into usb-next

2012-09-16 20:42:46 -07:00

core.h

Merge tag 'dwc3-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next

2012-09-11 13:52:48 -07:00

debug.h

…

debugfs.c

…

dwc3-exynos.c

usb: dwc3: exynos: add nop transceiver support

2012-09-10 19:29:42 +03:00

dwc3-omap.c

usb: dwc3: omap: add nop transceiver support

2012-09-10 19:29:42 +03:00

dwc3-pci.c

usb: dwc3: pci: add nop transceiver support

2012-09-10 19:29:41 +03:00

ep0.c

Merge 3.6-rc6 into usb-next

2012-09-16 20:42:46 -07:00

gadget.c

Merge 3.6-rc6 into usb-next

2012-09-16 20:42:46 -07:00

gadget.h

…

host.c

…

io.h

…

Kconfig

usb: gadget: get rid of USB_GADGET_{DUAL,SUPER}SPEED

2012-08-31 12:49:40 +03:00

Makefile

…