diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-19 06:49:35 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-19 06:49:35 -0500 |
commit | 9e18e1869f5ebac69f0d881fe97a198ebc0834db (patch) | |
tree | 18c5b5c185d39cbb50fa652b5e08d047c8cf06e1 /MAINTAINERS | |
parent | 04af964f9cb666caa7c1436d003f8fac0f1fedcc (diff) | |
parent | 460ed699f4c943e1ec4a8458869eb532fe31fd16 (diff) |
Merge branch 'next-samsung-asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into for-2.6.38
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 0094224ca79b..8e6548dbd5db 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 | ||
@@ -945,7 +945,7 @@ M: Magnus Damm <magnus.damm@gmail.com> | |||
945 | L: linux-sh@vger.kernel.org | 945 | L: linux-sh@vger.kernel.org |
946 | W: http://oss.renesas.com | 946 | W: http://oss.renesas.com |
947 | Q: http://patchwork.kernel.org/project/linux-sh/list/ | 947 | Q: http://patchwork.kernel.org/project/linux-sh/list/ |
948 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/genesis-2.6.git | 948 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git rmobile-latest |
949 | S: Supported | 949 | S: Supported |
950 | F: arch/arm/mach-shmobile/ | 950 | F: arch/arm/mach-shmobile/ |
951 | F: drivers/sh/ | 951 | F: drivers/sh/ |
@@ -2435,6 +2435,7 @@ F: drivers/net/wan/sdla.c | |||
2435 | FRAMEBUFFER LAYER | 2435 | FRAMEBUFFER LAYER |
2436 | L: linux-fbdev@vger.kernel.org | 2436 | L: linux-fbdev@vger.kernel.org |
2437 | W: http://linux-fbdev.sourceforge.net/ | 2437 | W: http://linux-fbdev.sourceforge.net/ |
2438 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6.git | ||
2438 | S: Orphan | 2439 | S: Orphan |
2439 | F: Documentation/fb/ | 2440 | F: Documentation/fb/ |
2440 | F: drivers/video/fb* | 2441 | F: drivers/video/fb* |
@@ -5676,7 +5677,7 @@ S: Maintained | |||
5676 | 5677 | ||
5677 | STAGING SUBSYSTEM | 5678 | STAGING SUBSYSTEM |
5678 | M: Greg Kroah-Hartman <gregkh@suse.de> | 5679 | 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 | 5680 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6.git |
5680 | L: devel@driverdev.osuosl.org | 5681 | L: devel@driverdev.osuosl.org |
5681 | S: Maintained | 5682 | S: Maintained |
5682 | F: drivers/staging/ | 5683 | F: drivers/staging/ |
@@ -5705,7 +5706,7 @@ M: Paul Mundt <lethal@linux-sh.org> | |||
5705 | L: linux-sh@vger.kernel.org | 5706 | L: linux-sh@vger.kernel.org |
5706 | W: http://www.linux-sh.org | 5707 | W: http://www.linux-sh.org |
5707 | Q: http://patchwork.kernel.org/project/linux-sh/list/ | 5708 | Q: http://patchwork.kernel.org/project/linux-sh/list/ |
5708 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git | 5709 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git sh-latest |
5709 | S: Supported | 5710 | S: Supported |
5710 | F: Documentation/sh/ | 5711 | F: Documentation/sh/ |
5711 | F: arch/sh/ | 5712 | F: arch/sh/ |
@@ -5910,7 +5911,7 @@ S: Maintained | |||
5910 | TTY LAYER | 5911 | TTY LAYER |
5911 | M: Greg Kroah-Hartman <gregkh@suse.de> | 5912 | M: Greg Kroah-Hartman <gregkh@suse.de> |
5912 | S: Maintained | 5913 | S: Maintained |
5913 | T: quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/ | 5914 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git |
5914 | F: drivers/char/tty_* | 5915 | F: drivers/char/tty_* |
5915 | F: drivers/serial/serial_core.c | 5916 | F: drivers/serial/serial_core.c |
5916 | F: include/linux/serial_core.h | 5917 | F: include/linux/serial_core.h |
@@ -6233,7 +6234,7 @@ USB SUBSYSTEM | |||
6233 | M: Greg Kroah-Hartman <gregkh@suse.de> | 6234 | M: Greg Kroah-Hartman <gregkh@suse.de> |
6234 | L: linux-usb@vger.kernel.org | 6235 | L: linux-usb@vger.kernel.org |
6235 | W: http://www.linux-usb.org | 6236 | W: http://www.linux-usb.org |
6236 | T: quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/ | 6237 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git |
6237 | S: Supported | 6238 | S: Supported |
6238 | F: Documentation/usb/ | 6239 | F: Documentation/usb/ |
6239 | F: drivers/net/usb/ | 6240 | F: drivers/net/usb/ |
@@ -6598,14 +6599,14 @@ F: drivers/platform/x86 | |||
6598 | 6599 | ||
6599 | XEN PCI SUBSYSTEM | 6600 | XEN PCI SUBSYSTEM |
6600 | M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 6601 | M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> |
6601 | L: xen-devel@lists.xensource.com | 6602 | L: xen-devel@lists.xensource.com (moderated for non-subscribers) |
6602 | S: Supported | 6603 | S: Supported |
6603 | F: arch/x86/pci/*xen* | 6604 | F: arch/x86/pci/*xen* |
6604 | F: drivers/pci/*xen* | 6605 | F: drivers/pci/*xen* |
6605 | 6606 | ||
6606 | XEN SWIOTLB SUBSYSTEM | 6607 | XEN SWIOTLB SUBSYSTEM |
6607 | M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 6608 | M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> |
6608 | L: xen-devel@lists.xensource.com | 6609 | L: xen-devel@lists.xensource.com (moderated for non-subscribers) |
6609 | S: Supported | 6610 | S: Supported |
6610 | F: arch/x86/xen/*swiotlb* | 6611 | F: arch/x86/xen/*swiotlb* |
6611 | F: drivers/xen/*swiotlb* | 6612 | F: drivers/xen/*swiotlb* |
@@ -6613,7 +6614,7 @@ F: drivers/xen/*swiotlb* | |||
6613 | XEN HYPERVISOR INTERFACE | 6614 | XEN HYPERVISOR INTERFACE |
6614 | M: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> | 6615 | M: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> |
6615 | M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 6616 | M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> |
6616 | L: xen-devel@lists.xen.org | 6617 | L: xen-devel@lists.xensource.com (moderated for non-subscribers) |
6617 | L: virtualization@lists.osdl.org | 6618 | L: virtualization@lists.osdl.org |
6618 | S: Supported | 6619 | S: Supported |
6619 | F: arch/x86/xen/ | 6620 | F: arch/x86/xen/ |