Merge tag 'fbdev-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux

Pull fbdev changes from Tomi Valkeinen:
 "Nothing particularly stands out in this pull request.  The biggest
  part of the changes are cleanups.

  Maybe one fix to mention is the "fb: reorder the lock sequence to fix
  potential dead lock" which hopefully fixes the fb locking issues
  reported by multiple persons.

  There are also a few commits that have changes to arch/arm/mach-at91
  and arch/avr32, which have been acked by the maintainers"

* tag 'fbdev-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (143 commits)
  fb: reorder the lock sequence to fix potential dead lock
  fbdev: shmobile-lcdcfb: Convert to clk_prepare/unprepare
  fbdev: shmobile-hdmi: Convert to clk_prepare/unprepare
  omapdss: Add new panel driver for Topolly td028ttec1 LCD.
  video: exynos_mipi_dsi: Unlock the mutex before returning
  video: da8xx-fb: remove unwanted define
  video: Remove unnecessary semicolons
  simplefb: use write-combined remapping
  simplefb: fix unmapping fb during destruction
  OMAPDSS: connector-dvi: fix releasing i2c_adapter
  OMAPDSS: DSI: fix perf measuring ifdefs
  framebuffer: Use fb_<level>
  framebuffer: Add fb_<level> convenience logging macros
  efifb: prevent null-deref when iterating dmi_list
  fbdev: fix error return code in metronomefb_probe()
  video: xilinxfb: Fix for "Use standard variable name convention"
  OMAPDSS: Fix de_level in videomode_to_omap_video_timings()
  video: xilinxfb: Simplify error path
  video: xilinxfb: Use devm_kzalloc instead of kzalloc
  video: xilinxfb: Use standard variable name convention
  ...

diff --cc drivers/video/amba-clcd.c
Simple merge

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

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

diff --cc drivers/video/backlight/l4f00242t03.c
Simple merge

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

diff --cc drivers/video/fsl-diu-fb.c
Simple merge

diff --cc drivers/video/mmp/hw/mmp_ctrl.c
Simple merge

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

diff --cc drivers/video/omap2/displays-new/Kconfig
Simple merge

diff --cc drivers/video/omap2/displays-new/connector-dvi.c
index 63d88ee6dfe410469215455795bd4b63b031a040,5641a23b78d129def923df31ab77dbcb8038ac4f..b6c50904038efcce92c9b324d846a16bfa07a4ef
--- 1/drivers/video/omap2/displays-new/connector-dvi.c
--- 2/drivers/video/omap2/displays-new/connector-dvi.c
+++ b/drivers/video/omap2/displays-new/connector-dvi.c
@@@ -262,8 -262,11 +262,11 @@@ static int dvic_probe_pdata(struct plat
  
        in = omap_dss_find_output(pdata->source);
        if (in == NULL) {
+               if (ddata->i2c_adapter)
+                       i2c_put_adapter(ddata->i2c_adapter);
+ 
                dev_err(&pdev->dev, "Failed to find video source\n");
 -              return -ENODEV;
 +              return -EPROBE_DEFER;
        }
  
        ddata->in = in;

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

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

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