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

1 files changed, 6 insertions, 0 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 9386a63ea8f6..477a20fc3436 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3108,6 +3108,12 @@ F:	drivers/video/
 F:      include/video/
 F:      include/linux/fb.h
 
+FREESCALE DIU FRAMEBUFFER DRIVER
+M:      Timur Tabi <timur@freescale.com>
+L:      linux-fbdev@vger.kernel.org
+S:      Supported
+F:      drivers/video/fsl-diu-fb.*
+
 FREESCALE DMA DRIVER
 M:      Li Yang <leoli@freescale.com>
 M:      Zhang Wei <zw@zh-kernel.org>