aboutsummaryrefslogtreecommitdiffstats
path: root/usb
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2005-12-23 10:44:23 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2005-12-23 10:44:23 -0800
commit373ecab16727fcb04e0d4684f5c65ce92f2e6ede (patch)
tree87c3978c3145658c7e75fa855375eff6bf562770 /usb
parent358ab939884962f98c4143756a8c42943e77be12 (diff)
downloadpatches-373ecab16727fcb04e0d4684f5c65ce92f2e6ede.tar.gz
2.6.15-rc6-git4 refresh
Diffstat (limited to 'usb')
-rw-r--r--usb/isp116x-hcd-cleanup.patch2
-rw-r--r--usb/usb-ehci-fix-driver-model-wakeup-flags.patch2
-rw-r--r--usb/usb-storage-update-maintainers.patch2
3 files changed, 3 insertions, 3 deletions
diff --git a/usb/isp116x-hcd-cleanup.patch b/usb/isp116x-hcd-cleanup.patch
index d08549e5e4caf6..c36a0ff9b481da 100644
--- a/usb/isp116x-hcd-cleanup.patch
+++ b/usb/isp116x-hcd-cleanup.patch
@@ -767,7 +767,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#else
--- gregkh-2.6.orig/MAINTAINERS
+++ gregkh-2.6/MAINTAINERS
-@@ -2648,6 +2648,12 @@ L: linux-usb-users@lists.sourceforge.net
+@@ -2641,6 +2641,12 @@ L: linux-usb-users@lists.sourceforge.net
L: linux-usb-devel@lists.sourceforge.net
S: Maintained
diff --git a/usb/usb-ehci-fix-driver-model-wakeup-flags.patch b/usb/usb-ehci-fix-driver-model-wakeup-flags.patch
index 7dad9885765a43..9a592e516f5869 100644
--- a/usb/usb-ehci-fix-driver-model-wakeup-flags.patch
+++ b/usb/usb-ehci-fix-driver-model-wakeup-flags.patch
@@ -21,7 +21,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- gregkh-2.6.orig/drivers/usb/host/ehci-hcd.c
+++ gregkh-2.6/drivers/usb/host/ehci-hcd.c
-@@ -617,7 +617,7 @@ static irqreturn_t ehci_irq (struct usb_
+@@ -624,7 +624,7 @@ static irqreturn_t ehci_irq (struct usb_
}
/* remote wakeup [4.3.1] */
diff --git a/usb/usb-storage-update-maintainers.patch b/usb/usb-storage-update-maintainers.patch
index 65f980c87c30eb..62102b7a90df52 100644
--- a/usb/usb-storage-update-maintainers.patch
+++ b/usb/usb-storage-update-maintainers.patch
@@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- gregkh-2.6.orig/MAINTAINERS
+++ gregkh-2.6/MAINTAINERS
-@@ -2665,7 +2665,7 @@ USB MASS STORAGE DRIVER
+@@ -2658,7 +2658,7 @@ USB MASS STORAGE DRIVER
P: Matthew Dharm
M: mdharm-usb@one-eyed-alien.net
L: linux-usb-users@lists.sourceforge.net