aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-11-14 23:54:00 -0500
committerPaul Mundt <lethal@linux-sh.org>2010-11-14 23:54:00 -0500
commit344ac148442e3223ac1b0e29ef3d3fb73c5ed61a (patch)
tree7b654a74727c57344296768c3a2d7d03b17f37ea /MAINTAINERS
parent8ac5ba61cb1a80df407f2cdedb28b28d3b1d84ec (diff)
parent0143832cc96d0bf78486297aad5c8fb2c2ead02a (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--MAINTAINERS14
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>
161L: linux-serial@vger.kernel.org 161L: linux-serial@vger.kernel.org
162W: http://serial.sourceforge.net 162W: http://serial.sourceforge.net
163S: Maintained 163S: Maintained
164T: quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/ 164T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git
165F: drivers/serial/8250* 165F: drivers/serial/8250*
166F: include/linux/serial_8250.h 166F: include/linux/serial_8250.h
167 167
@@ -5676,7 +5676,7 @@ S: Maintained
5676 5676
5677STAGING SUBSYSTEM 5677STAGING SUBSYSTEM
5678M: Greg Kroah-Hartman <gregkh@suse.de> 5678M: Greg Kroah-Hartman <gregkh@suse.de>
5679T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-next-2.6.git 5679T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6.git
5680L: devel@driverdev.osuosl.org 5680L: devel@driverdev.osuosl.org
5681S: Maintained 5681S: Maintained
5682F: drivers/staging/ 5682F: drivers/staging/
@@ -5910,7 +5910,7 @@ S: Maintained
5910TTY LAYER 5910TTY LAYER
5911M: Greg Kroah-Hartman <gregkh@suse.de> 5911M: Greg Kroah-Hartman <gregkh@suse.de>
5912S: Maintained 5912S: Maintained
5913T: quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/ 5913T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git
5914F: drivers/char/tty_* 5914F: drivers/char/tty_*
5915F: drivers/serial/serial_core.c 5915F: drivers/serial/serial_core.c
5916F: include/linux/serial_core.h 5916F: include/linux/serial_core.h
@@ -6233,7 +6233,7 @@ USB SUBSYSTEM
6233M: Greg Kroah-Hartman <gregkh@suse.de> 6233M: Greg Kroah-Hartman <gregkh@suse.de>
6234L: linux-usb@vger.kernel.org 6234L: linux-usb@vger.kernel.org
6235W: http://www.linux-usb.org 6235W: http://www.linux-usb.org
6236T: quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/ 6236T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git
6237S: Supported 6237S: Supported
6238F: Documentation/usb/ 6238F: Documentation/usb/
6239F: drivers/net/usb/ 6239F: drivers/net/usb/
@@ -6598,14 +6598,14 @@ F: drivers/platform/x86
6598 6598
6599XEN PCI SUBSYSTEM 6599XEN PCI SUBSYSTEM
6600M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> 6600M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
6601L: xen-devel@lists.xensource.com 6601L: xen-devel@lists.xensource.com (moderated for non-subscribers)
6602S: Supported 6602S: Supported
6603F: arch/x86/pci/*xen* 6603F: arch/x86/pci/*xen*
6604F: drivers/pci/*xen* 6604F: drivers/pci/*xen*
6605 6605
6606XEN SWIOTLB SUBSYSTEM 6606XEN SWIOTLB SUBSYSTEM
6607M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> 6607M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
6608L: xen-devel@lists.xensource.com 6608L: xen-devel@lists.xensource.com (moderated for non-subscribers)
6609S: Supported 6609S: Supported
6610F: arch/x86/xen/*swiotlb* 6610F: arch/x86/xen/*swiotlb*
6611F: drivers/xen/*swiotlb* 6611F: drivers/xen/*swiotlb*
@@ -6613,7 +6613,7 @@ F: drivers/xen/*swiotlb*
6613XEN HYPERVISOR INTERFACE 6613XEN HYPERVISOR INTERFACE
6614M: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> 6614M: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
6615M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> 6615M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
6616L: xen-devel@lists.xen.org 6616L: xen-devel@lists.xensource.com (moderated for non-subscribers)
6617L: virtualization@lists.osdl.org 6617L: virtualization@lists.osdl.org
6618S: Supported 6618S: Supported
6619F: arch/x86/xen/ 6619F: arch/x86/xen/