aboutsummaryrefslogtreecommitdiffstats
path: root/usb
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2009-06-15 15:43:29 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2009-06-15 15:43:29 -0700
commit1e24fcefce737199a35b8284032b979097a65326 (patch)
treeaa03e73b6be3d9d2a179afcd6070d4126d913a78 /usb
parent7d43e111469922d2a4df34fb1a036b95764cfc69 (diff)
downloadpatches-1e24fcefce737199a35b8284032b979097a65326.tar.gz
more merges with Linus's tree
Diffstat (limited to 'usb')
-rw-r--r--usb/usb-xhci-add-makefile-maintainers-and-kconfig-entries.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/usb/usb-xhci-add-makefile-maintainers-and-kconfig-entries.patch b/usb/usb-xhci-add-makefile-maintainers-and-kconfig-entries.patch
index 2313fae8a6b897..cd8613b416820e 100644
--- a/usb/usb-xhci-add-makefile-maintainers-and-kconfig-entries.patch
+++ b/usb/usb-xhci-add-makefile-maintainers-and-kconfig-entries.patch
@@ -78,7 +78,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
obj-$(CONFIG_USB_R8A66597_HCD) += host/
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -6138,6 +6138,12 @@ L: linux-wireless@vger.kernel.org
+@@ -6164,6 +6164,12 @@ L: linux-wireless@vger.kernel.org
S: Maintained
F: drivers/net/wireless/rndis_wlan.c