Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 17 Mar 2011 16:56:43 +0000 (09:56 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 17 Mar 2011 16:56:43 +0000 (09:56 -0700)
commitfd34b0dee4d237ce9332cc62b03adebfe4fa9f9d
treefa37676f7f696be7104ea116ab9c72dc8bbbc70e
parent40c7f2112ce18fa5eb6dc209c50dd0f046790191
parentc9ac1361d2258a667672cf531cd840807daba4f1
Merge git://git./linux/kernel/git/lethal/fbdev-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6:
  fbdev: sh_mobile_lcdc: Add YUV framebuffer support
  viafb: split pll configs up
  viafb: remove duplicated clock storage
  viafb: always return the best possible clock
  viafb: remove duplicated clock information
  fbdev: sh_mobile_lcdcfb: add backlight support
  viafb: factor lcd scaling parameters out
  viafb: strip some structures
  viafb: remove unused data_mode and device_type
  viafb: kill lcd_panel_id
  video via: make local variables static
  video via: fix iomem access
  video/via: drop deprecated (and unused) i2c_adapter.id
drivers/video/Kconfig