diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-07 11:18:59 (GMT) |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-07 11:18:59 (GMT) |
commit | 7a4b35082c0f6997cb32b67a9cde169ec8e64706 (patch) | |
tree | c3fb875143d9c7862c2051bcd3447e26e354fdde /MAINTAINERS | |
parent | defa4c738aa90e29e91eff43b0c1b3198367ce9c (diff) | |
parent | ea61623fe9badd5a195b3a0878e6d89a2f97ac0e (diff) | |
download | linux-7a4b35082c0f6997cb32b67a9cde169ec8e64706.tar.xz |
Merge branch 'cpufreq-next' of git://git.linaro.org/people/vireshk/linux into pm-cpufreq
ARM cpufreq updates from Viresh Kumar.
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 92a6624..90f45f4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3323,11 +3323,12 @@ F: drivers/net/wan/dlci.c F: drivers/net/wan/sdla.c FRAMEBUFFER LAYER -M: Florian Tobias Schandinat <FlorianSchandinat@gmx.de> +M: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com> +M: Tomi Valkeinen <tomi.valkeinen@ti.com> L: linux-fbdev@vger.kernel.org W: http://linux-fbdev.sourceforge.net/ Q: http://patchwork.kernel.org/project/linux-fbdev/list/ -T: git git://github.com/schandinat/linux-2.6.git fbdev-next +T: git git://git.kernel.org/pub/scm/linux/kernel/git/plagnioj/linux-fbdev.git S: Maintained F: Documentation/fb/ F: Documentation/devicetree/bindings/fb/ @@ -6088,7 +6089,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 <jim.cromie@gmail.com> |