Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[GitHub/MotorolaMobilityLLC/kernel-slsi.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 151f4ef978a4aa5ae82c976e76c8716cafa9f4fb..cba5f4df0e21e000c2bedd8c43ca15a6283b5175 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1750,8 +1750,8 @@ T:        http://www.harbaum.org/till/i2c_tiny_usb
 S:     Maintained
 
 i386 BOOT CODE
-P:     Riley H. Williams
-M:     Riley@Williams.Name
+P:     H. Peter Anvin
+M:     hpa@zytor.com
 L:     Linux-Kernel@vger.kernel.org
 S:     Maintained
 
@@ -2903,6 +2903,11 @@ P:       Michal Ostrowski
 M:     mostrows@speakeasy.net
 S:     Maintained
 
+PPP OVER L2TP
+P:     James Chapman
+M:     jchapman@katalix.com
+S:     Maintained
+
 PREEMPTIBLE KERNEL
 P:     Robert Love
 M:     rml@tech9.net