Greg Kroah-Hartman 66b0835e2b Merge 2.6.38-rc5 into usb-next ...

This is needed to resolve some merge conflicts that were found
in the USB host controller patches, and reported by Stephen Rothwell.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

2011-02-17 09:56:55 -08:00

..

alauda.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

cypress_atacb.c

USB: usb-storage: added missing MODULE_LICENSE("GPL") for usb-storage ums-* modules

2009-03-24 16:20:35 -07:00

datafab.c

USB: storage: Drop an unneeded a NULL test

2009-09-23 06:46:29 -07: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

freecom.c

usb: storage: freecom: Fixed several coding style issues.

2010-08-10 14:35:39 -07: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: isd200.c: Remove unnecessary kmalloc cast

2010-08-10 14:35:34 -07:00

jumpshot.c

USB: storage: Drop an unneeded a NULL test

2009-09-23 06:46:29 -07:00

karma.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

Kconfig

USB: usb_storage: add ums-realtek driver

2011-01-22 19:40:10 -08:00

libusual.c

usb-storage: prepare for subdriver separation

2009-03-24 16:20:34 -07:00

Makefile

USB: usb_storage: add ums-realtek driver

2011-01-22 19:40:10 -08:00

onetouch.c

USB: rename usb_buffer_alloc() and usb_buffer_free() users

2010-05-20 13:21:38 -07:00

option_ms.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09: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: prepare for subdriver separation

2009-03-24 16:20:34 -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: usb_storage: add ums-realtek driver

2011-01-22 19:40:10 -08:00

scsiglue.c

SCSI host lock push-down

2010-11-16 13:33:23 -08:00

scsiglue.h

USB: remove CVS keywords

2008-07-21 15:15:55 -07:00

sddr09.c

USB: storage: Use USB_ prefix instead of US_ prefix

2010-10-22 10:21:49 -07:00

sddr55.c

USB: usb-storage: added missing MODULE_LICENSE("GPL") for usb-storage ums-* modules

2009-03-24 16:20:35 -07:00

shuttle_usbat.c

USB: storage: fix misplaced parenthesis

2010-03-02 14:55:08 -08:00

sierra_ms.c

USB: storage: sierra_ms: fix sysfs file attribute

2010-11-15 14:04:14 -08:00

sierra_ms.h

USB Storage Sierra: TRU-Install feature update

2008-08-13 17:32:51 -07:00

transport.c

USB: storage: Use USB_ prefix instead of US_ prefix

2010-10-22 10:21:49 -07:00

transport.h

USB: usb-storage: merge CB and CBI transport routines

2009-01-07 09:59:57 -08:00

uas.c

Merge branch 'usb-next' into musb-merge

2010-12-16 10:05:06 -08: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: usb-storage: unusual_devs entry for Coby MP3 player

2011-02-03 16:51:05 -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: usb_storage: add ums-realtek driver

2011-01-22 19:40:10 -08: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: Use USB_ prefix instead of US_ prefix

2010-10-22 10:21:49 -07:00

usb.h

USB: remove uses of URB_NO_SETUP_DMA_MAP

2010-05-20 13:21:31 -07:00

usual-tables.c

USB: usb_storage: add ums-realtek driver

2011-01-22 19:40:10 -08:00