Merge tag 'fbdev-for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/plagnioj...

Pull fbdev update from Jean-Christophe PLAGNIOL-VILLARD:
 "Various fbdev changes for 3.11
   - xilinxfb updates
   - Small cleanups and fixes to multiple drivers
   - OMAP display subsystem bug updates
   - imxfb dt support"

* tag 'fbdev-for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/plagnioj/linux-fbdev: (95 commits)
  video: imxfb: Add DT support
  video: i740fb: Make i740fb_init static
  fb: make fp_get_options name argument const
  video: mmp: fix graphics/video layer enable/mask swap issue
  video: mmp: fix memcpy wrong size for mmp_addr issue
  radeon: use pdev->pm_cap instead of pci_find_capability(..,PCI_CAP_ID_PM)
  aty128fb: use pdev->pm_cap instead of pci_find_capability(..,PCI_CAP_ID_PM)
  video: of_display_timing.h: Declare 'display_timing'
  fbdev: bfin-lq035q1-fb: Use dev_pm_ops
  fbmem: return -EFAULT on copy_to_user() failure
  OMAPDSS: DPI: Fix wrong pixel clock limit
  video: replace strict_strtoul() with kstrtoul()
  uvesafb: Correct/simplify warning message
  fb: fix atyfb unused data warnings
  fb: fix atyfb build warning
  video: imxfb: Make local symbols static
  video: udlfb: Make local symbol static
  video: udlfb: Use NULL instead of 0
  video: smscufx: Use NULL instead of 0
  video: remove unnecessary platform_set_drvdata()
  ...

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

diff --cc drivers/video/omap2/displays/panel-n8x0.c
index 860b18014ad750c75653c6f5ccca3fc3cf8da0d6,d3860c50d3f992b81239c44a9f7bc8b651018e9e..1d525fc84db959894dce439899f1517b7c96b0ac
--- 1/drivers/video/omap2/displays/panel-n8x0.c
--- 2/drivers/video/omap2/displays/panel-n8x0.c
+++ b/drivers/video/omap2/displays/panel-n8x0.c
@@@ -527,7 -527,7 +527,7 @@@ static int n8x0_panel_update(struct oma
        dh = dssdev->panel.timings.y_res;
  
        if (x != 0 || y != 0 || w != dw || h != dh) {
-               dev_err(&dssdev->dev, "invalid update region %d, %d, %d, %d\n",
 -              dev_err(dssdev->dev, "invaid update region %d, %d, %d, %d\n",
++              dev_err(dssdev->dev, "invalid update region %d, %d, %d, %d\n",
                        x, y, w, h);
                return -EINVAL;
        }

diff --cc drivers/video/pxa3xx-gcu.c
Simple merge