Greg Kroah-Hartman 7483948fdd Merge tag 'usb-3.3-rc3' into usb-next ... This is done to resolve a merge conflict with: drivers/usb/class/cdc-wdm.c and to better handle future patches for this driver as it is under active development at the moment. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2012-02-10 11:13:53 -08:00
..
cdc-acm.c	Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb	2012-01-09 12:09:47 -08:00
cdc-acm.h	USB: cdc-acm: Fix potential deadlock (lockdep warning)	2011-12-09 16:18:18 -08:00
cdc-wdm.c	Merge tag 'usb-3.3-rc3' into usb-next	2012-02-10 11:13:53 -08: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	Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2012-01-08 12:19:57 -08:00
usbtmc.c	USB: convert drivers/usb/* to use module_usb_driver()	2011-11-18 09:34:02 -08:00