diff --git a/[refs] b/[refs] index 7d721ea29d01..29b2a0f78d87 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ea99b1adf22abd62bdcf14b1c9a0a4d3664eefd8 +refs/heads/master: 2b6bac9ee99fa7d60dfa0debd82ccf4217931b1e diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 7714c3c363c3..f35a259a6564 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -6088,7 +6088,15 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git S: Maintained F: arch/parisc/ +F: Documentation/parisc/ F: drivers/parisc/ +F: drivers/char/agp/parisc-agp.c +F: drivers/input/serio/gscps2.c +F: drivers/parport/parport_gsc.* +F: drivers/tty/serial/8250/8250_gsc.c +F: drivers/video/sti* +F: drivers/video/console/sti* +F: drivers/video/logo/logo_parisc* PC87360 HARDWARE MONITORING DRIVER M: Jim Cromie