From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 17 Mar 2011 16:56:43 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6
X-Git-Tag: v2.6.39-rc1~457
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=fd34b0dee4d237ce9332cc62b03adebfe4fa9f9d;p=~shefty%2Frdma-dev.git

Merge git://git.kernel.org/pub/scm/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
---

fd34b0dee4d237ce9332cc62b03adebfe4fa9f9d