Merge tag 'fbdev-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 14 Nov 2013 05:44:20 +0000 (14:44 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 14 Nov 2013 05:44:20 +0000 (14:44 +0900)
commitf0d55cc1a65852e6647d4f5d707c1c9b5471ce3c
treee96d6a88590f656d86c1f58cb0b34d40d6091b63
parent549608eadb31eac5d579ed70a21ac722bdf72861
parent3a41c5dbe8bc396a7fb16ca8739e945bb003342e
Merge tag 'fbdev-3.13' of git://git./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
  ...
13 files changed:
drivers/video/amba-clcd.c
drivers/video/au1100fb.c
drivers/video/au1200fb.c
drivers/video/backlight/l4f00242t03.c
drivers/video/cyber2000fb.c
drivers/video/fsl-diu-fb.c
drivers/video/mmp/hw/mmp_ctrl.c
drivers/video/neofb.c
drivers/video/omap2/displays-new/Kconfig
drivers/video/omap2/displays-new/connector-dvi.c
drivers/video/omap2/dss/dispc.c
drivers/video/s3fb.c
drivers/video/stifb.c