diff --git a/[refs] b/[refs] index fccf11bb7b44..ca412aa3276e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 24725d1ecf26ba05d74c1cc3ae7467b61a900421 +refs/heads/master: cabaaf415cc9820cfbf2bc86308b94b78e31fe3e diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 7a22e7068527..b1859597fa2a 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -4667,6 +4667,9 @@ M: giometti@enneenne.com W: http://wiki.enneenne.com/index.php/LinuxPPS_support L: linuxpps@ml.enneenne.com (subscribers-only) S: Maintained +F: Documentation/pps/ +F: drivers/pps/ +F: include/linux/pps*.h PREEMPTIBLE KERNEL P: Robert Love