From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 8 Aug 2010 17:04:17 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://github.com/schandinat/linux-2.6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c5f347579a661c9506e794315f0798b75ef71d35;p=mv-sheeva.git

Merge branch 'for-linus' of git://github.com/schandinat/linux-2.6

* 'for-linus' of git://github.com/schandinat/linux-2.6:
  drivers/video/via/via-gpio.c: fix warning
  viafb: Depends on X86
  fbdev: section cleanup in viafb driver
  viafb: fix accel_flags check_var bug
  viafb: probe cleanups
  viafb: remove ioctls which break the framebuffer interface
  viafb: update fix before calculating depth
  viafb: PLL value cleanup
  viafb: simplify lcd size "detection"
  viafb: fix PCI table
  viafb: add lcd scaling support for some IGPs
  viafb: improve lcd code readability
  viafb: remove duplicated scaling code
  MAINTAINERS: update viafb entry
---

c5f347579a661c9506e794315f0798b75ef71d35