Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6

* 'fbdev-next' of git://github.com/schandinat/linux-2.6: (175 commits)
  module_param: make bool parameters really bool (drivers/video/i810)
  Revert "atmel_lcdfb: Adjust HFP calculation so it matches the manual."
  OMAPDSS: HDMI: Disable DDC internal pull up
  OMAPDSS: HDMI: Move duplicate code from boardfile
  OMAPDSS: add OrtusTech COM43H4M10XTC display support
  OMAP: DSS2: Support for UMSH-8173MD TFT panel
  ASoC: OMAP: HDMI: Move HDMI codec trigger function to generic HDMI driver
  OMAPDSS: HDMI: Create function to enable HDMI audio
  ASoC: OMAP: HDMI: Correct signature of ASoC functions
  ASoC: OMAP: HDMI: Introduce driver data for audio codec
  grvga: fix section mismatch warnings
  video: s3c-fb: Don't keep device runtime active when open
  video: s3c-fb: Hold runtime PM references when touching registers
  video: s3c-fb: Take a runtime PM reference when unblanked
  video: s3c-fb: Disable runtime PM in error paths from probe
  video: s3c-fb: Use s3c_fb_enable() to enable the framebuffer
  video: s3c-fb: Make runtime PM functional again
  drivers/video: fsl-diu-fb: merge fsl_diu_alloc() into map_video_memory()
  drivers/video: fsl-diu-fb: add default platform ops functions
  drivers/video: fsl-diu-fb: remove broken reference count enabling the display
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-omap2/board-4430sdp.c
Simple merge

diff --cc arch/arm/mach-omap2/board-omap4panda.c
Simple merge

diff --cc arch/arm/mach-omap2/display.c
index bc6cf863a563bcf51f76240598ca6424b92939fe,ffd9bd98302362f1d51133e8759564cef30d8ea1..3c446d1a1781fe3d819b2732ea28e2426c2a1348
--- 1/arch/arm/mach-omap2/display.c
--- 2/arch/arm/mach-omap2/display.c
+++ b/arch/arm/mach-omap2/display.c
@@@ -28,8 -27,9 +28,9 @@@
  #include <plat/omap_hwmod.h>
  #include <plat/omap_device.h>
  #include <plat/omap-pm.h>
 -#include <plat/common.h>
 +#include "common.h"
  
+ #include "mux.h"
  #include "control.h"
  #include "display.h"
  

diff --cc arch/arm/mach-shmobile/board-ag5evm.c
Simple merge

diff --cc arch/arm/mach-shmobile/board-ap4evb.c
Simple merge

diff --cc arch/arm/mach-shmobile/board-mackerel.c
Simple merge

diff --cc arch/arm/mach-shmobile/clock-sh7372.c
Simple merge

diff --cc arch/arm/mach-shmobile/clock-sh73a0.c
Simple merge

diff --cc arch/sh/boards/mach-ap325rxa/setup.c
Simple merge

diff --cc arch/sh/boards/mach-ecovec24/setup.c
Simple merge

diff --cc arch/sh/boards/mach-kfr2r09/setup.c
Simple merge

diff --cc arch/sh/boards/mach-migor/setup.c
Simple merge

diff --cc arch/sh/boards/mach-se/7724/setup.c
Simple merge

diff --cc drivers/media/video/omap/omap_vout.c
Simple merge

diff --cc drivers/video/Kconfig
Simple merge

diff --cc drivers/video/cirrusfb.c
Simple merge

diff --cc drivers/video/mxsfb.c
Simple merge

diff --cc drivers/video/omap2/dss/core.c
Simple merge

diff --cc drivers/video/omap2/dss/dsi.c
Simple merge

diff --cc drivers/video/omap2/dss/dss.h
Simple merge

diff --cc drivers/video/omap2/omapfb/omapfb-main.c
Simple merge

diff --cc drivers/video/omap2/omapfb/omapfb.h
Simple merge