From: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date: Tue, 27 Nov 2012 10:06:10 +0000 (+0200)
Subject: Merge branch 'fbdev-next' of github.com:timur-tabi/linux-2.6 into for-linus
X-Git-Tag: next-20121205~60^2~4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0074120228496d6fceb75ba17d21dc0b7476f8c4;p=karo-tx-linux.git

Merge branch 'fbdev-next' of github.com:timur-tabi/linux-2.6 into for-linus

* 'fbdev-next' of github.com:timur-tabi/linux-2.6:
  drivers/video: fsl-diu-fb: store EDID data in the global object
  drivers/video: fsl-diu-fb: don't touch registers for unused features
  drivers/video: fsl-diu-fb: clean up reset of primary display
  drivers/video: fsl-diu-fb: remove unused 'cursor_reset' variable
  drivers/video: fsl-diu-fb: improve message displays
  drivers/video: fsl-diu-fb: streamline enabling of interrupts
  drivers/video: fsl-diu-fb: add support for set_gamma ioctls
  drivers/video: fsl-diu-fb: simplify platforms that have only one port
  MAINTAINERS: Make Timur Tabi the maintainer for the Freescale DIU driver
---

0074120228496d6fceb75ba17d21dc0b7476f8c4