diff --git a/[refs] b/[refs] index 91de85a39929..7530214626b7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f7852be649d7c005f2ab8820e85d7eb94f589ebc +refs/heads/master: eb9ebe677d7b4d94ca1bb2677f73a64d70dda24c diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 231bda28c428..f8bcbdc6e2db 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -398,6 +398,12 @@ P: Arnaldo Carvalho de Melo M: acme@ghostprotocols.net S: Maintained +APPLETOUCH TOUCHPAD DRIVER +P: Johannes Berg +M: johannes@sipsolutions.net +L: linux-input@atrey.karlin.mff.cuni.cz +S: Maintained + ARC FRAMEBUFFER DRIVER P: Jaya Kumar M: jayalk@intworks.biz