diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-11-26 15:04:42 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-11-26 15:04:47 +0100 |
| commit | e4e91ac410356da3a518188f371e9d3b52ee38ee (patch) | |
| tree | e1b33743a08847030285d34bcb2eb8ba90f30a0c /MAINTAINERS | |
| parent | ea7872b9d6a81101f6ba0ec141544a62fea35876 (diff) | |
| parent | 3561d43fd289f590fdae672e5eb831b8d5cf0bf6 (diff) | |
| download | op-kernel-dev-e4e91ac410356da3a518188f371e9d3b52ee38ee.zip op-kernel-dev-e4e91ac410356da3a518188f371e9d3b52ee38ee.tar.gz | |
Merge commit 'v2.6.37-rc3' into perf/core
Merge reason: Pick up latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f94cd37..96e1a83 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1829,6 +1829,13 @@ W: http://www.chelsio.com S: Supported F: drivers/net/cxgb4vf/ +STMMAC ETHERNET DRIVER +M: Giuseppe Cavallaro <peppe.cavallaro@st.com> +L: netdev@vger.kernel.org +W: http://www.stlinux.com +S: Supported +F: drivers/net/stmmac/ + CYBERPRO FB DRIVER M: Russell King <linux@arm.linux.org.uk> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) @@ -2008,6 +2015,7 @@ F: drivers/hwmon/dme1737.c DOCBOOK FOR DOCUMENTATION M: Randy Dunlap <rdunlap@xenotime.net> S: Maintained +F: scripts/kernel-doc DOCKING STATION DRIVER M: Shaohua Li <shaohua.li@intel.com> @@ -2018,6 +2026,7 @@ F: drivers/acpi/dock.c DOCUMENTATION M: Randy Dunlap <rdunlap@xenotime.net> L: linux-doc@vger.kernel.org +T: quilt oss.oracle.com/~rdunlap/kernel-doc-patches/current/ S: Maintained F: Documentation/ |
