Greg Kroah-Hartman 61906313bd Merge 3.4-rc6 into usb-next ...

This resolves the conflict with:
	drivers/usb/host/ehci-tegra.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2012-05-07 09:03:39 -07:00

..

cdc-acm.c

USB merge for 3.4-rc1

2012-03-20 11:26:30 -07:00

cdc-acm.h

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

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

cdc-wdm.c

Merge 3.4-rc6 into usb-next

2012-05-07 09:03:39 -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