From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 22 May 2011 19:39:58 +0000 (-0700)
Subject: Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=71a8638480eb8fb6cfabe2ee9ca3fbc6e3453a14;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6

* 'viafb-next' of git://github.com/schandinat/linux-2.6: (24 commits)
  viafb: Automatic OLPC XO-1.5 configuration
  viafb: remove unused CEA mode
  viafb: try to map less memory in case of failure
  viafb: use write combining for video ram
  viafb: add X server compatibility mode
  viafb: reduce OLPC refresh a bit
  viafb: fix OLPC XO 1.5 device connection
  viafb: fix OLPC DCON refresh rate
  viafb: delete clock and PLL initialization
  viafb: replace custom return values
  viafb: some small cleanup for global variables
  viafb: gather common good, old VGA initialization in one place
  viafb: add engine clock support
  viafb: add VIA slapping capability
  viafb: split clock and PLL code to an extra file
  viafb: add primary/secondary clock on/off switches
  viafb: add clock source selection and PLL power management support
  viafb: prepare for PLL separation
  viafb: call viafb_get_clk_value only in viafb_set_vclock
  viafb: remove unused max_hres/vres
  ...
---

71a8638480eb8fb6cfabe2ee9ca3fbc6e3453a14