diff --git a/[refs] b/[refs] index d323d5829d26..03b0aee78a02 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 38d15b656258b52a659fcf3e181f85b51bd1851f +refs/heads/master: a6d2370b0839c228ae4e680e75263ecf0a73e251 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 151f4ef978a4..fcfe598b8d74 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -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