summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-09-11 13:37:28 +0200
committerIngo Molnar <mingo@elte.hu>2008-09-11 13:37:28 +0200
commit09b22a2f678ae733801b888c44756d0abd686b8a (patch)
tree6ca52d4011ce6b11c6450d3a574ea6a53cc0d339 /MAINTAINERS
parent3ba35573ad9a149a3af19625b502679283382f6b (diff)
parentadee14b2e1557d0a8559f29681732d05a89dfc35 (diff)
downloadlinux-09b22a2f678ae733801b888c44756d0abd686b8a.tar.gz
linux-09b22a2f678ae733801b888c44756d0abd686b8a.tar.bz2
linux-09b22a2f678ae733801b888c44756d0abd686b8a.zip
Merge commit 'v2.6.27-rc6' into sched/devel
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS6
1 files changed, 4 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index af279458b614..186be3ba5069 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -750,11 +750,13 @@ P: Ville Syrjala
M: syrjala@sci.fi
S: Maintained
-ATL1 ETHERNET DRIVER
+ATLX ETHERNET DRIVERS
P: Jay Cliburn
M: jcliburn@gmail.com
P: Chris Snook
M: csnook@redhat.com
+P: Jie Yang
+M: jie.yang@atheros.com
L: atl1-devel@lists.sourceforge.net
W: http://sourceforge.net/projects/atl1
W: http://atl1.sourceforge.net
@@ -1593,7 +1595,7 @@ S: Supported
EMBEDDED LINUX
P: Paul Gortmaker
M: paul.gortmaker@windriver.com
-P David Woodhouse
+P: David Woodhouse
M: dwmw2@infradead.org
L: linux-embedded@vger.kernel.org
S: Maintained