diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-11-14 23:54:00 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-14 23:54:00 -0500 |
commit | 344ac148442e3223ac1b0e29ef3d3fb73c5ed61a (patch) | |
tree | 7b654a74727c57344296768c3a2d7d03b17f37ea /MAINTAINERS | |
parent | 8ac5ba61cb1a80df407f2cdedb28b28d3b1d84ec (diff) | |
parent | 0143832cc96d0bf78486297aad5c8fb2c2ead02a (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh/urgent
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 39267ace999f..353e0ee30fe0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -161,7 +161,7 @@ M: Greg Kroah-Hartman <gregkh@suse.de> | |||
161 | L: linux-serial@vger.kernel.org | 161 | L: linux-serial@vger.kernel.org |
162 | W: http://serial.sourceforge.net | 162 | W: http://serial.sourceforge.net |
163 | S: Maintained | 163 | S: Maintained |
164 | T: quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/ | 164 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git |
165 | F: drivers/serial/8250* | 165 | F: drivers/serial/8250* |
166 | F: include/linux/serial_8250.h | 166 | F: include/linux/serial_8250.h |
167 | 167 | ||
@@ -5676,7 +5676,7 @@ S: Maintained | |||
5676 | 5676 | ||
5677 | STAGING SUBSYSTEM | 5677 | STAGING SUBSYSTEM |
5678 | M: Greg Kroah-Hartman <gregkh@suse.de> | 5678 | M: Greg Kroah-Hartman <gregkh@suse.de> |
5679 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-next-2.6.git | 5679 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6.git |
5680 | L: devel@driverdev.osuosl.org | 5680 | L: devel@driverdev.osuosl.org |
5681 | S: Maintained | 5681 | S: Maintained |
5682 | F: drivers/staging/ | 5682 | F: drivers/staging/ |
@@ -5910,7 +5910,7 @@ S: Maintained | |||
5910 | TTY LAYER | 5910 | TTY LAYER |
5911 | M: Greg Kroah-Hartman <gregkh@suse.de> | 5911 | M: Greg Kroah-Hartman <gregkh@suse.de> |
5912 | S: Maintained | 5912 | S: Maintained |
5913 | T: quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/ | 5913 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git |
5914 | F: drivers/char/tty_* | 5914 | F: drivers/char/tty_* |
5915 | F: drivers/serial/serial_core.c | 5915 | F: drivers/serial/serial_core.c |
5916 | F: include/linux/serial_core.h | 5916 | F: include/linux/serial_core.h |
@@ -6233,7 +6233,7 @@ USB SUBSYSTEM | |||
6233 | M: Greg Kroah-Hartman <gregkh@suse.de> | 6233 | M: Greg Kroah-Hartman <gregkh@suse.de> |
6234 | L: linux-usb@vger.kernel.org | 6234 | L: linux-usb@vger.kernel.org |
6235 | W: http://www.linux-usb.org | 6235 | W: http://www.linux-usb.org |
6236 | T: quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/ | 6236 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git |
6237 | S: Supported | 6237 | S: Supported |
6238 | F: Documentation/usb/ | 6238 | F: Documentation/usb/ |
6239 | F: drivers/net/usb/ | 6239 | F: drivers/net/usb/ |
@@ -6598,14 +6598,14 @@ F: drivers/platform/x86 | |||
6598 | 6598 | ||
6599 | XEN PCI SUBSYSTEM | 6599 | XEN PCI SUBSYSTEM |
6600 | M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 6600 | M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> |
6601 | L: xen-devel@lists.xensource.com | 6601 | L: xen-devel@lists.xensource.com (moderated for non-subscribers) |
6602 | S: Supported | 6602 | S: Supported |
6603 | F: arch/x86/pci/*xen* | 6603 | F: arch/x86/pci/*xen* |
6604 | F: drivers/pci/*xen* | 6604 | F: drivers/pci/*xen* |
6605 | 6605 | ||
6606 | XEN SWIOTLB SUBSYSTEM | 6606 | XEN SWIOTLB SUBSYSTEM |
6607 | M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 6607 | M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> |
6608 | L: xen-devel@lists.xensource.com | 6608 | L: xen-devel@lists.xensource.com (moderated for non-subscribers) |
6609 | S: Supported | 6609 | S: Supported |
6610 | F: arch/x86/xen/*swiotlb* | 6610 | F: arch/x86/xen/*swiotlb* |
6611 | F: drivers/xen/*swiotlb* | 6611 | F: drivers/xen/*swiotlb* |
@@ -6613,7 +6613,7 @@ F: drivers/xen/*swiotlb* | |||
6613 | XEN HYPERVISOR INTERFACE | 6613 | XEN HYPERVISOR INTERFACE |
6614 | M: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> | 6614 | M: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> |
6615 | M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 6615 | M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> |
6616 | L: xen-devel@lists.xen.org | 6616 | L: xen-devel@lists.xensource.com (moderated for non-subscribers) |
6617 | L: virtualization@lists.osdl.org | 6617 | L: virtualization@lists.osdl.org |
6618 | S: Supported | 6618 | S: Supported |
6619 | F: arch/x86/xen/ | 6619 | F: arch/x86/xen/ |