From 276348f8826492078d9dc16be234904db01f1ebd Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Mon, 9 Aug 2010 17:20:40 -0700
Subject: [PATCH] --- yaml --- r: 207314 b: refs/heads/master c:
 90ca28d1eaff14c8de8665cf31db4fcca602075c h: refs/heads/master v: v3

---
 [refs]            | 2 +-
 trunk/MAINTAINERS | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7181c7de8ebe..7cbb0e09bb2c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c984e24d47f824df352234ead831fb3c8f18eca8
+refs/heads/master: 90ca28d1eaff14c8de8665cf31db4fcca602075c
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index 6ec10907e6fc..048cbfa18606 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -4531,7 +4531,7 @@ F:	drivers/net/pppox.c
 PPP OVER L2TP
 M:	James Chapman <jchapman@katalix.com>
 S:	Maintained
-F:	drivers/net/pppol2tp.c
+F:	net/l2tp/l2tp_ppp.c
 F:	include/linux/if_pppol2tp.h
 
 PPS SUPPORT