diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-12-13 03:28:43 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-12-13 03:28:43 -0500 |
commit | 20aeeb356ba2e8daa99b5942c528ae2b3ea28433 (patch) | |
tree | d2cebc7039954851998d592123899f5627def7a9 /MAINTAINERS | |
parent | 07a9e2b2fbdda631eeff54e4b8ebcaaea71be538 (diff) | |
parent | 5b84ba26a9672e615897234fa5efd3eea2d6b295 (diff) |
Merge branch 'topic/workq-update' into topic/asoc
Conflicts:
sound/soc/codecs/wm8350.c
sound/soc/codecs/wm8753.c
sound/soc/sh/fsi.c
sound/soc/soc-core.c
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 0c6e84a49ec..d7521eb12b2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -1359,7 +1359,7 @@ F: include/net/bluetooth/ | |||
1359 | 1359 | ||
1360 | BONDING DRIVER | 1360 | BONDING DRIVER |
1361 | M: Jay Vosburgh <fubar@us.ibm.com> | 1361 | M: Jay Vosburgh <fubar@us.ibm.com> |
1362 | L: bonding-devel@lists.sourceforge.net | 1362 | L: netdev@vger.kernel.org |
1363 | W: http://sourceforge.net/projects/bonding/ | 1363 | W: http://sourceforge.net/projects/bonding/ |
1364 | S: Supported | 1364 | S: Supported |
1365 | F: drivers/net/bonding/ | 1365 | F: drivers/net/bonding/ |
@@ -1829,6 +1829,13 @@ W: http://www.chelsio.com | |||
1829 | S: Supported | 1829 | S: Supported |
1830 | F: drivers/net/cxgb4vf/ | 1830 | F: drivers/net/cxgb4vf/ |
1831 | 1831 | ||
1832 | STMMAC ETHERNET DRIVER | ||
1833 | M: Giuseppe Cavallaro <peppe.cavallaro@st.com> | ||
1834 | L: netdev@vger.kernel.org | ||
1835 | W: http://www.stlinux.com | ||
1836 | S: Supported | ||
1837 | F: drivers/net/stmmac/ | ||
1838 | |||
1832 | CYBERPRO FB DRIVER | 1839 | CYBERPRO FB DRIVER |
1833 | M: Russell King <linux@arm.linux.org.uk> | 1840 | M: Russell King <linux@arm.linux.org.uk> |
1834 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | 1841 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |
@@ -2008,6 +2015,7 @@ F: drivers/hwmon/dme1737.c | |||
2008 | DOCBOOK FOR DOCUMENTATION | 2015 | DOCBOOK FOR DOCUMENTATION |
2009 | M: Randy Dunlap <rdunlap@xenotime.net> | 2016 | M: Randy Dunlap <rdunlap@xenotime.net> |
2010 | S: Maintained | 2017 | S: Maintained |
2018 | F: scripts/kernel-doc | ||
2011 | 2019 | ||
2012 | DOCKING STATION DRIVER | 2020 | DOCKING STATION DRIVER |
2013 | M: Shaohua Li <shaohua.li@intel.com> | 2021 | M: Shaohua Li <shaohua.li@intel.com> |
@@ -2018,6 +2026,7 @@ F: drivers/acpi/dock.c | |||
2018 | DOCUMENTATION | 2026 | DOCUMENTATION |
2019 | M: Randy Dunlap <rdunlap@xenotime.net> | 2027 | M: Randy Dunlap <rdunlap@xenotime.net> |
2020 | L: linux-doc@vger.kernel.org | 2028 | L: linux-doc@vger.kernel.org |
2029 | T: quilt oss.oracle.com/~rdunlap/kernel-doc-patches/current/ | ||
2021 | S: Maintained | 2030 | S: Maintained |
2022 | F: Documentation/ | 2031 | F: Documentation/ |
2023 | 2032 | ||
@@ -2051,7 +2060,7 @@ F: Documentation/blockdev/drbd/ | |||
2051 | 2060 | ||
2052 | DRIVER CORE, KOBJECTS, DEBUGFS AND SYSFS | 2061 | DRIVER CORE, KOBJECTS, DEBUGFS AND SYSFS |
2053 | M: Greg Kroah-Hartman <gregkh@suse.de> | 2062 | M: Greg Kroah-Hartman <gregkh@suse.de> |
2054 | T: quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/ | 2063 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git |
2055 | S: Supported | 2064 | S: Supported |
2056 | F: Documentation/kobject.txt | 2065 | F: Documentation/kobject.txt |
2057 | F: drivers/base/ | 2066 | F: drivers/base/ |
@@ -2071,7 +2080,7 @@ F: include/drm/ | |||
2071 | 2080 | ||
2072 | INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets) | 2081 | INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets) |
2073 | M: Chris Wilson <chris@chris-wilson.co.uk> | 2082 | M: Chris Wilson <chris@chris-wilson.co.uk> |
2074 | L: intel-gfx@lists.freedesktop.org | 2083 | L: intel-gfx@lists.freedesktop.org (subscribers-only) |
2075 | L: dri-devel@lists.freedesktop.org | 2084 | L: dri-devel@lists.freedesktop.org |
2076 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel.git | 2085 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel.git |
2077 | S: Supported | 2086 | S: Supported |
@@ -2435,10 +2444,12 @@ F: drivers/net/wan/sdla.c | |||
2435 | FRAMEBUFFER LAYER | 2444 | FRAMEBUFFER LAYER |
2436 | L: linux-fbdev@vger.kernel.org | 2445 | L: linux-fbdev@vger.kernel.org |
2437 | W: http://linux-fbdev.sourceforge.net/ | 2446 | W: http://linux-fbdev.sourceforge.net/ |
2447 | Q: http://patchwork.kernel.org/project/linux-fbdev/list/ | ||
2438 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6.git | 2448 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6.git |
2439 | S: Orphan | 2449 | S: Orphan |
2440 | F: Documentation/fb/ | 2450 | F: Documentation/fb/ |
2441 | F: drivers/video/fb* | 2451 | F: drivers/video/ |
2452 | F: include/video/ | ||
2442 | F: include/linux/fb.h | 2453 | F: include/linux/fb.h |
2443 | 2454 | ||
2444 | FREESCALE DMA DRIVER | 2455 | FREESCALE DMA DRIVER |
@@ -4053,9 +4064,8 @@ F: drivers/scsi/NCR_D700.* | |||
4053 | 4064 | ||
4054 | NETEFFECT IWARP RNIC DRIVER (IW_NES) | 4065 | NETEFFECT IWARP RNIC DRIVER (IW_NES) |
4055 | M: Faisal Latif <faisal.latif@intel.com> | 4066 | M: Faisal Latif <faisal.latif@intel.com> |
4056 | M: Chien Tung <chien.tin.tung@intel.com> | ||
4057 | L: linux-rdma@vger.kernel.org | 4067 | L: linux-rdma@vger.kernel.org |
4058 | W: http://www.neteffect.com | 4068 | W: http://www.intel.com/Products/Server/Adapters/Server-Cluster/Server-Cluster-overview.htm |
4059 | S: Supported | 4069 | S: Supported |
4060 | F: drivers/infiniband/hw/nes/ | 4070 | F: drivers/infiniband/hw/nes/ |
4061 | 4071 | ||
@@ -5828,6 +5838,8 @@ M: Chris Metcalf <cmetcalf@tilera.com> | |||
5828 | W: http://www.tilera.com/scm/ | 5838 | W: http://www.tilera.com/scm/ |
5829 | S: Supported | 5839 | S: Supported |
5830 | F: arch/tile/ | 5840 | F: arch/tile/ |
5841 | F: drivers/char/hvc_tile.c | ||
5842 | F: drivers/net/tile/ | ||
5831 | 5843 | ||
5832 | TLAN NETWORK DRIVER | 5844 | TLAN NETWORK DRIVER |
5833 | M: Samuel Chessman <chessman@tux.org> | 5845 | M: Samuel Chessman <chessman@tux.org> |