diff --git a/[refs] b/[refs] index ed97ca6af7cf..96e57a5569a5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 127c49ae097952b9686038392f862d69ac6a9c6a +refs/heads/master: 9db35182b9528339a4655f4b894ac3305e0c3ac6 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index f37a1e0dcd18..0499a2142707 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -3517,6 +3517,7 @@ W: http://www.linux-m68k.org/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git S: Maintained F: arch/m68k/ +F: drivers/zorro/ M68K ON APPLE MACINTOSH P: Joshua Thompson @@ -3524,6 +3525,7 @@ M: funaho@jurai.org W: http://www.mac.linux-m68k.org/ L: linux-m68k@lists.linux-m68k.org S: Maintained +F: arch/m68k/mac/ M68K ON HP9000/300 P: Philip Blundell