tree eb900af7a9f758fe775ded478645fcc1ce75328f
parent 537d84787659b355b3331813dc134c7497ddafa5
parent f27098379b1dbfedae99e5b86e10529f799d4071
author Linus Torvalds <torvalds@linux-foundation.org> 1281287057 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1281287057 -0700

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