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

..

cdc-acm.c

usb: cdc-acm: remove duplicated include from cdc-acm.c

2012-09-05 16:52:09 -07:00

cdc-acm.h

USB: cdc-acm: Fix potential deadlock (lockdep warning)

2011-12-09 16:18:18 -08:00

cdc-wdm.c

USB: cdc-wdm: fix wdm_find_device* return value

2012-09-10 15:33:00 -07:00

Kconfig

USB: add USB test and measurement class driver

2008-10-17 14:40:51 -07:00

Makefile

USB: add USB test and measurement class driver

2008-10-17 14:40:51 -07:00

usblp.c

USB: usblp.c: remove dbg() usage

2012-05-01 21:33:31 -07:00

usbtmc.c

USB: convert drivers/usb/* to use module_usb_driver()

2011-11-18 09:34:02 -08:00