diff --git a/[refs] b/[refs] index 7fda56484cb8..449d2e56bca1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6604072798da52547111cc06afacb8d9f2a907cf +refs/heads/master: 1f26978afd123deb22dd3c7dc75771a02f6e03f6 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 4f96ac81089c..85e1734f9a50 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -486,13 +486,6 @@ S: Maintained F: drivers/net/appletalk/ F: net/appletalk/ -APPLETOUCH TOUCHPAD DRIVER -M: Johannes Berg -L: linux-input@vger.kernel.org -S: Maintained -F: Documentation/input/appletouch.txt -F: drivers/input/mouse/appletouch.c - ARC FRAMEBUFFER DRIVER M: Jaya Kumar S: Maintained