Merge commit 'v2.6.27-rc6' into sched/devel

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