diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-02-01 10:12:23 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-02-01 10:12:23 -0800 |
| commit | f66cb622b9a7c33b7326ae775a3d5f57ebdf7686 (patch) | |
| tree | 61973cf7683954476d6ab75daecab437cfc0b191 /usb | |
| parent | bd614a703e922b46dfb7d50b5e76e51618b5c351 (diff) | |
| parent | d7e2c8f25258d5a01d22091e4e7851d6d3020d34 (diff) | |
| download | patches-f66cb622b9a7c33b7326ae775a3d5f57ebdf7686.tar.gz | |
Merge branch 'master' of gregkh@master.kernel.org:/pub/scm/linux/kernel/git/gregkh/patches
Diffstat (limited to 'usb')
21 files changed, 22 insertions, 5 deletions
diff --git a/usb/usb-add-ehci-ixp-bus-glue.patch b/usb/usb-add-ehci-ixp-bus-glue.patch index 18af9eb6404451..f5f593bcf61039 100644 --- a/usb/usb-add-ehci-ixp-bus-glue.patch +++ b/usb/usb-add-ehci-ixp-bus-glue.patch @@ -26,7 +26,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig -@@ -49,6 +49,7 @@ config USB_ARCH_HAS_EHCI +@@ -50,6 +50,7 @@ config USB_ARCH_HAS_EHCI boolean default y if PPC_83xx default y if SOC_AU1200 diff --git a/usb/usb-add-support-for-4348-5523-winchiphead-usb-rs-232-adapter.patch b/usb/usb-add-support-for-4348-5523-winchiphead-usb-rs-232-adapter.patch index 5999c60fe777b0..1f89a875696a6e 100644 --- a/usb/usb-add-support-for-4348-5523-winchiphead-usb-rs-232-adapter.patch +++ b/usb/usb-add-support-for-4348-5523-winchiphead-usb-rs-232-adapter.patch @@ -15,6 +15,7 @@ add support for: [ mingo@elte.hu: merged it and nursed it upstream ] +Cc: stable <stable@kernel.org> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> diff --git a/usb/usb-add-support-for-superh-ohci.patch b/usb/usb-add-support-for-superh-ohci.patch index 747ee10ce69a85..bcca8489595b8b 100644 --- a/usb/usb-add-support-for-superh-ohci.patch +++ b/usb/usb-add-support-for-superh-ohci.patch @@ -26,7 +26,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig -@@ -41,6 +41,10 @@ config USB_ARCH_HAS_OHCI +@@ -42,6 +42,10 @@ config USB_ARCH_HAS_OHCI default y if PPC_MPC52xx # MIPS: default y if SOC_AU1X00 diff --git a/usb/usb-adding-yc-cable-usb-serial-device-to-pl2303.patch b/usb/usb-adding-yc-cable-usb-serial-device-to-pl2303.patch index 5089e240d6538a..ebebfcf9fd13e4 100644 --- a/usb/usb-adding-yc-cable-usb-serial-device-to-pl2303.patch +++ b/usb/usb-adding-yc-cable-usb-serial-device-to-pl2303.patch @@ -12,6 +12,7 @@ USB<->Serial adapter as a product. This particular adapter is sold by Radio Shack. I've done limited testing on a few different systems with no issues. +Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- diff --git a/usb/usb-at91_udc-uses-generic-gpio-calls-minor-cleanup.patch b/usb/usb-at91_udc-uses-generic-gpio-calls-minor-cleanup.patch index 95b8238970f1a5..847bda95b21953 100644 --- a/usb/usb-at91_udc-uses-generic-gpio-calls-minor-cleanup.patch +++ b/usb/usb-at91_udc-uses-generic-gpio-calls-minor-cleanup.patch @@ -251,7 +251,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> # define VDBG(stuff...) do{}while(0) --- a/include/asm-arm/arch-at91/board.h +++ b/include/asm-arm/arch-at91/board.h -@@ -39,7 +39,8 @@ +@@ -40,7 +40,8 @@ /* USB Device */ struct at91_udc_data { u8 vbus_pin; /* high == host powering us */ diff --git a/usb/usb-correct-comments-in-usb-core-notify.c.patch b/usb/usb-correct-comments-in-usb-core-notify.c.patch index 2e6073d579a292..943ac0e7f1b5ac 100644 --- a/usb/usb-correct-comments-in-usb-core-notify.c.patch +++ b/usb/usb-correct-comments-in-usb-core-notify.c.patch @@ -10,7 +10,7 @@ Content-Disposition: inline This patch corrects the wrong function name mentioned in the comments of usb_unregister_notify function. -Signed-off-by : Manish Katiyar <mkatiyar@gmail.com> +Signed-off-by: Manish Katiyar <mkatiyar@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- diff --git a/usb/usb-cp2101-new-device-ids.patch b/usb/usb-cp2101-new-device-ids.patch index ec668e44df2360..e4f60aba5d8a59 100644 --- a/usb/usb-cp2101-new-device-ids.patch +++ b/usb/usb-cp2101-new-device-ids.patch @@ -9,6 +9,7 @@ Message-ID: <1199364359.5056.2.camel@localhost.localdomain> Six new device IDs for CP2101 driver. +Cc: stable <stable@kernel.org> Signed-off-by: Craig Shelley <craig@microtron.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> diff --git a/usb/usb-fix-usbtest-halt-check-on-big-endian-systems.patch b/usb/usb-fix-usbtest-halt-check-on-big-endian-systems.patch index 8994df5ebcdb16..e47690484a9cf3 100644 --- a/usb/usb-fix-usbtest-halt-check-on-big-endian-systems.patch +++ b/usb/usb-fix-usbtest-halt-check-on-big-endian-systems.patch @@ -10,6 +10,7 @@ usbtest did not swap the received status information when checking for a non-zero value and failed to discover halted endpoints on big endian systems. +Cc: stable <stable@kernel.org> Signed-off-by: Jan Andersson <jan@gaisler.com> Acked-by: David Brownell <david-b@pacbell.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> diff --git a/usb/usb-ftdi-driver-add-support-for-optical-probe-device.patch b/usb/usb-ftdi-driver-add-support-for-optical-probe-device.patch index ee9cfe32e8a270..496fa46e29803d 100644 --- a/usb/usb-ftdi-driver-add-support-for-optical-probe-device.patch +++ b/usb/usb-ftdi-driver-add-support-for-optical-probe-device.patch @@ -9,7 +9,8 @@ Message-ID: <478FD8BA.6040604@mindspring.com> Added support for the Elster Unicom III Optical Probe. The device ID has already been added to the usb.ids file. -Signed-off-by: Ed Beroset <beroset@mindspring.com> +Cc: stable <stable@kernel.org> +Signed-off-by: Ed Beroset <beroset@mindspring.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- diff --git a/usb/usb-ftdi-sio-patch-to-add-vendor-device-id-for-atk_16ic-ccd.patch b/usb/usb-ftdi-sio-patch-to-add-vendor-device-id-for-atk_16ic-ccd.patch index 317c2de7f73ca5..58d57e02c7a491 100644 --- a/usb/usb-ftdi-sio-patch-to-add-vendor-device-id-for-atk_16ic-ccd.patch +++ b/usb/usb-ftdi-sio-patch-to-add-vendor-device-id-for-atk_16ic-ccd.patch @@ -10,6 +10,7 @@ little patches only to add vendor/device id of ATK_16IC CCD cam for astronomy. From: Franco Lanza <nextime@nexlab.it> +Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- diff --git a/usb/usb-ftdi_sio-enabling-multiple-elv-devices-adding-em1010pc.patch b/usb/usb-ftdi_sio-enabling-multiple-elv-devices-adding-em1010pc.patch index 2809912d414509..d4ff628bc648c6 100644 --- a/usb/usb-ftdi_sio-enabling-multiple-elv-devices-adding-em1010pc.patch +++ b/usb/usb-ftdi_sio-enabling-multiple-elv-devices-adding-em1010pc.patch @@ -20,6 +20,7 @@ We are aware that you can specify one additional device using the vendor/product option of the module. But lot's of users own more than one device. +Cc: stable <stable@kernel.org> Signed-off-by: Peter Stark <peter.stark@t-online.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> diff --git a/usb/usb-gadget-fix-fsl_usb2_udc-potential-oops.patch b/usb/usb-gadget-fix-fsl_usb2_udc-potential-oops.patch index f69df1052ea026..4fa6e6ee03e534 100644 --- a/usb/usb-gadget-fix-fsl_usb2_udc-potential-oops.patch +++ b/usb/usb-gadget-fix-fsl_usb2_udc-potential-oops.patch @@ -15,6 +15,7 @@ misleading and contains a logical mistake. Here is the patch to fix it. http://bugzilla.kernel.org/show_bug.cgi?id=9595 +Cc: stable <stable@kernel.org> Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> diff --git a/usb/usb-keyspan-fix-oops.patch b/usb/usb-keyspan-fix-oops.patch index ba99109a5af308..00b3153538d87e 100644 --- a/usb/usb-keyspan-fix-oops.patch +++ b/usb/usb-keyspan-fix-oops.patch @@ -10,6 +10,7 @@ If we get a data URB back from the hardware after we have put the tty to bed we go kaboom. Fortunately all we need to do is process the URB without trying to ram its contents down the throat of an ex-tty. +Cc: stable <stable@kernel.org> Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> diff --git a/usb/usb-pl2303-add-support-for-ratoc-rex-usb60f.patch b/usb/usb-pl2303-add-support-for-ratoc-rex-usb60f.patch index d3b0b59e6d3880..28f86b35956ddb 100644 --- a/usb/usb-pl2303-add-support-for-ratoc-rex-usb60f.patch +++ b/usb/usb-pl2303-add-support-for-ratoc-rex-usb60f.patch @@ -11,6 +11,7 @@ pl2303: add support for RATOC REX-USB60F This patch adds support for RATOC REX-USB60F Serial Adapters, which is widely used in Japan recently. +Cc: stable <stable@kernel.org> Signed-off-by: Akira Tsukamoto <akirat@rd.scei.sony.co.jp> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> diff --git a/usb/usb-remove-duplicate-entry-in-option-driver-and-pl2303-driver-for-huawei-modem.patch b/usb/usb-remove-duplicate-entry-in-option-driver-and-pl2303-driver-for-huawei-modem.patch index 5797f369a0eeeb..fd4958854b36b7 100644 --- a/usb/usb-remove-duplicate-entry-in-option-driver-and-pl2303-driver-for-huawei-modem.patch +++ b/usb/usb-remove-duplicate-entry-in-option-driver-and-pl2303-driver-for-huawei-modem.patch @@ -12,6 +12,7 @@ From: Daniel Koz�k <kozzi11@gmail.com> Remove entry for Huawei E620 UMTS/HSDPA card (ID: 12d1:1001) in pl2303 driver Option driver is use instead +Cc: stable <stable@kernel.org> Signed-off-by: Daniel Koz�k <kozzi11@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> diff --git a/usb/usb-sierra-add-support-for-aircard-881u.patch b/usb/usb-sierra-add-support-for-aircard-881u.patch index f95989bb2f1f6e..35f2129ad01145 100644 --- a/usb/usb-sierra-add-support-for-aircard-881u.patch +++ b/usb/usb-sierra-add-support-for-aircard-881u.patch @@ -11,6 +11,7 @@ From: Jessica L. Blank <j@twu.net:> Adds the appropriate vendor and device IDs for the AirCard 881U to sierra.c. (This device is often rebadged by AT&T as the USBConnect 881). +Cc: stable <stable@kernel.org> Signed-off-by: Jessica L Blank <j@twu.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> diff --git a/usb/usb-sierra-add-support-for-onda-h600-zte-mf330-datacard-to-usb-driver-for-sierra-wireless.patch b/usb/usb-sierra-add-support-for-onda-h600-zte-mf330-datacard-to-usb-driver-for-sierra-wireless.patch index 2cbc92dd43a8fe..b5558a6c9affe2 100644 --- a/usb/usb-sierra-add-support-for-onda-h600-zte-mf330-datacard-to-usb-driver-for-sierra-wireless.patch +++ b/usb/usb-sierra-add-support-for-onda-h600-zte-mf330-datacard-to-usb-driver-for-sierra-wireless.patch @@ -10,6 +10,7 @@ Content-Disposition: inline Added support for Onda H600/Zte MF330 GPRS/UMTS/HSDPA datacard +Cc: stable <stable@kernel.org> Signed-off-by: Bruno Redondi <bruno.redondi@altarisoluzione.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> diff --git a/usb/usb-sierra-driver-add-devices.patch b/usb/usb-sierra-driver-add-devices.patch index 7b52a64750599c..a0019c5bde7d92 100644 --- a/usb/usb-sierra-driver-add-devices.patch +++ b/usb/usb-sierra-driver-add-devices.patch @@ -12,6 +12,7 @@ From: Kevin Lloyd <linux@sierrawireless.com> The following improvements were made: - Added new product support: MC5725, AC 880 U, MP 3G (UMTS & CDMA) +Cc: stable <stable@kernel.org> Signed-off-by: Kevin Lloyd <linux@sierrawireless.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> diff --git a/usb/usb-storage-add-unusual_dev-for-hp-r707.patch b/usb/usb-storage-add-unusual_dev-for-hp-r707.patch index bfa8fb503078f5..d3b12b1a98e3e1 100644 --- a/usb/usb-storage-add-unusual_dev-for-hp-r707.patch +++ b/usb/usb-storage-add-unusual_dev-for-hp-r707.patch @@ -15,6 +15,7 @@ EIO gets reported to dmesg, and block device is marked "offline" (it is). Reproduced vol_id behavior with: "dd if=/dev/sda of=/dev/null skip=60800 count=1" +Cc: stable <stable@kernel.org> Signed-off-by: Grant Grundler <grundler@parisc-linux.org> Signed-off-by: Phil Dibowitz <phil@ipom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> diff --git a/usb/usb-use-gfp_noio-in-reset-path.patch b/usb/usb-use-gfp_noio-in-reset-path.patch index a9c96a6772afb5..95293458bfa53b 100644 --- a/usb/usb-use-gfp_noio-in-reset-path.patch +++ b/usb/usb-use-gfp_noio-in-reset-path.patch @@ -10,6 +10,7 @@ this function will run in the context of the scsi error handler thread. It must use GFP_NOIO instead of GFP_KERNEL to avoid a possible deadlock. +Cc: stable <stable@kernel.org> Signed-off-by: Oliver Neukum <oneukum@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> diff --git a/usb/usb-variant-of-the-dell-wireless-5520-driver.patch b/usb/usb-variant-of-the-dell-wireless-5520-driver.patch index 73414e2fe31489..244ab992ccfb78 100644 --- a/usb/usb-variant-of-the-dell-wireless-5520-driver.patch +++ b/usb/usb-variant-of-the-dell-wireless-5520-driver.patch @@ -25,6 +25,7 @@ nc@knight:~/tmp/linux-source-2.6.23/drivers/usb/serial$ cu -l ttyUSB0 -s 115200 +GCAP: +CGSM,+DS,+ES From: Nate Carlson <natecars@natecarlson.com> +Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |