Greg Kroah-Hartman e765bf84d5 Merge 3.5-rc5 into usb-next ... This resolves a merge issue with the option.c USB serial driver. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2012-07-05 08:58:03 -07:00
..
Kconfig	Documentation: remove references to /etc/modprobe.conf	2012-03-30 16:03:15 -07:00
Makefile	Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6	2011-03-16 15:19:35 -07:00
alauda.c	usb: Disable dynamic id of USB storage subdrivers	2012-01-24 14:31:03 -08:00
cypress_atacb.c	usb: Disable dynamic id of USB storage subdrivers	2012-01-24 14:31:03 -08:00
datafab.c	usb: Disable dynamic id of USB storage subdrivers	2012-01-24 14:31:03 -08:00
debug.c	USB: remove CVS keywords	2008-07-21 15:15:55 -07:00
debug.h	USB: remove CVS keywords	2008-07-21 15:15:55 -07:00
ene_ub6250.c	usb/storage/ene_ub6250: Remove redundant NULL check before release_firmware() and pointless assignment	2012-04-18 13:52:35 -07:00
freecom.c	usb: Disable dynamic id of USB storage subdrivers	2012-01-24 14:31:03 -08:00
initializers.c	USB: usb-storage fails to attach to Huawei Datacard cdrom device	2009-09-23 06:46:32 -07:00
initializers.h	USB: remove CVS keywords	2008-07-21 15:15:55 -07:00
isd200.c	usb: Disable dynamic id of USB storage subdrivers	2012-01-24 14:31:03 -08:00
jumpshot.c	usb: Disable dynamic id of USB storage subdrivers	2012-01-24 14:31:03 -08:00
karma.c	usb: Disable dynamic id of USB storage subdrivers	2012-01-24 14:31:03 -08:00
libusual.c	usb-storage: prepare for subdriver separation	2009-03-24 16:20:34 -07:00
onetouch.c	usb: Disable dynamic id of USB storage subdrivers	2012-01-24 14:31:03 -08:00
option_ms.c	usb: Add module.h to drivers/usb consumers who really use it.	2011-10-31 19:31:25 -04:00
option_ms.h	USB: unusual dev for Option N.V. ZeroCD modems	2009-01-07 10:00:09 -08:00
protocol.c	USB: storage: fixed space issues in coding style.	2012-06-13 15:30:38 -07:00
protocol.h	USB: usb-storage: merge ATAPI and QIC-157 protocol routines	2009-01-07 09:59:57 -08:00
realtek_cr.c	usb/storage: redefine US_BULK_FLAG_IN and use it	2012-02-28 11:07:42 -08:00
scsiglue.c	SCSI & usb-storage: add try_rc_10_first flag	2012-06-22 22:05:31 -07:00
scsiglue.h	USB: remove CVS keywords	2008-07-21 15:15:55 -07:00
sddr09.c	usb: Disable dynamic id of USB storage subdrivers	2012-01-24 14:31:03 -08:00
sddr55.c	usb: Disable dynamic id of USB storage subdrivers	2012-01-24 14:31:03 -08:00
shuttle_usbat.c	usb: Disable dynamic id of USB storage subdrivers	2012-01-24 14:31:03 -08:00
sierra_ms.c	usb: Add module.h to drivers/usb consumers who really use it.	2011-10-31 19:31:25 -04:00
sierra_ms.h	USB Storage Sierra: TRU-Install feature update	2008-08-13 17:32:51 -07:00
transport.c	usb/storage: redefine US_BULK_FLAG_IN and use it	2012-02-28 11:07:42 -08:00
transport.h	usb/storage: a couple defines from drivers/usb/storage/transport.h to include/linux/usb/storage.h	2012-02-28 11:05:18 -08:00
uas.c	uas: task mgmt & error handling	2012-06-25 11:51:01 -07:00
unusual_alauda.h	USB: storage: Use USB_ prefix instead of US_ prefix	2010-10-22 10:21:49 -07:00
unusual_cypress.h	USB: usb-storage: unusual_devs update for Cypress ATACB	2011-01-22 18:31:26 -08:00
unusual_datafab.h	USB: storage: Use USB_ prefix instead of US_ prefix	2010-10-22 10:21:49 -07:00
unusual_devs.h	usb-storage: revert commit afff07e61a (Add 090c:1000 to unusal-devs)	2012-06-22 22:05:32 -07:00
unusual_ene_ub6250.h	Staging: Merge ENE UB6250 SD card codes from keucr to drivers/usb/storage	2011-03-07 13:40:59 -08:00
unusual_freecom.h	USB: storage: Use USB_ prefix instead of US_ prefix	2010-10-22 10:21:49 -07:00
unusual_isd200.h	USB: storage: Use USB_ prefix instead of US_ prefix	2010-10-22 10:21:49 -07:00
unusual_jumpshot.h	USB: storage: Use USB_ prefix instead of US_ prefix	2010-10-22 10:21:49 -07:00
unusual_karma.h	USB: storage: Use USB_ prefix instead of US_ prefix	2010-10-22 10:21:49 -07:00
unusual_onetouch.h	USB: storage: Use USB_ prefix instead of US_ prefix	2010-10-22 10:21:49 -07:00
unusual_realtek.h	usb-storage: fix up the unusual_realtek device list	2011-05-17 11:56:28 -07:00
unusual_sddr09.h	USB: storage: Use USB_ prefix instead of US_ prefix	2010-10-22 10:21:49 -07:00
unusual_sddr55.h	USB: storage: Use USB_ prefix instead of US_ prefix	2010-10-22 10:21:49 -07:00
unusual_usbat.h	USB: storage: Use USB_ prefix instead of US_ prefix	2010-10-22 10:21:49 -07:00
usb.c	USB: storage: fixed keyword related space issues.	2012-05-17 09:48:29 -07:00
usb.h	usb-storage: fix freezing of the scanning thread	2012-02-21 16:29:15 -08:00
usual-tables.c	Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6	2011-03-16 15:19:35 -07:00