Merge branch 'cpufreq-next' of git://git.linaro.org/people/vireshk/linux into pm...

ARM cpufreq updates from Viresh Kumar.

diff --combined MAINTAINERS
index 92a66246892ea28cc76499c0ba6397dc5c90ff57,f35a259a6564a4bc31a7dabbafd8f3f64e9c6a03..90f45f474dd0a6a7b1ea3afb37cd6fbbda9a5587
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2215,8 -2215,7 +2215,8 @@@ M:      Viresh Kumar <viresh.kumar@linaro.or
  L:    cpufreq@vger.kernel.org
  L:    linux-pm@vger.kernel.org
  S:    Maintained
 -T:    git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
 +T:    git git://git.linaro.org/people/vireshk/linux.git (For ARM Updates)
  F:    drivers/cpufreq/
  F:    include/linux/cpufreq.h
  
@@@ -3323,11 -3322,12 +3323,12 @@@ F:   drivers/net/wan/dlci.
  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 -6088,15 +6089,15 @@@ T:    git git://git.kernel.org/pub/scm/lin
  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>