Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (137 commits)
  ARM: bcmring: convert to use sp804 clockevents
  ARM: bcmring: convert to sp804 clocksource
  ARM: 6912/1: bcmring: Add clkdev table in init_early
  clockevents: ARM sp804: obtain sp804 timer rate via clks
  clockevents: ARM sp804: allow clockevent name to be specified
  clocksource: ARM sp804: obtain sp804 timer rate via clks
  clocksource: ARM sp804: allow clocksource name to be specified
  clocksource: convert OMAP1 to 32-bit down counting clocksource
  clocksource: convert MXS timrotv2 to 32-bit down counting clocksource
  clocksource: convert SPEAr platforms 16-bit up counting clocksource
  clocksource: convert Integrator/AP 16-bit down counting clocksource
  clocksource: convert W90x900 24-bit down counting clocksource
  clocksource: convert ARM 32-bit down counting clocksources
  clocksource: convert ARM 32-bit up counting clocksources
  clocksource: add common mmio clocksource
  ARM: update sa1100 to reflect PXA updates
  ARM: omap1: convert to using readl/writel instead of volatile struct
  ARM: omap1: delete useless interrupt handler
  ARM: s5p: consolidate selection of timer register
  ARM: 6939/1: fix missing 'cpu_relax()' declaration
  ...

diff --combined drivers/video/Kconfig
index 6d13967,62f337a..f9916ca
--- 1/drivers/video/Kconfig
--- 2/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@@ -8,9 -8,6 +8,6 @@@ menu "Graphics support
  config HAVE_FB_ATMEL
        bool
  
- config HAVE_FB_IMX
-       bool
- 
  config SH_MIPI_DSI
        tristate
        depends on (SUPERH || ARCH_SHMOBILE) && HAVE_CLK
@@@ -359,7 -356,7 +356,7 @@@ config FB_SA110
  
  config FB_IMX
        tristate "Freescale i.MX LCD support"
-       depends on FB && (HAVE_FB_IMX || ARCH_MX1 || ARCH_MX2)
+       depends on FB && IMX_HAVE_PLATFORM_IMX_FB
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@@ -1562,17 -1559,6 +1559,17 @@@ config FB_VIA_DIRECT_PROCF
          correct output device configuration.
          Its use is strongly discouraged.
  
 +config FB_VIA_X_COMPATIBILITY
 +      bool "X server compatibility"
 +      depends on FB_VIA
 +      default n
 +      help
 +        This option reduces the functionality (power saving, ...) of the
 +        framebuffer to avoid negative impact on the OpenChrome X server.
 +        If you use any X server other than fbdev you should enable this
 +        otherwise it should be safe to disable it and allow using all
 +        features.
 +
  endif
  
  config FB_NEOMAGIC