From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 28 Feb 2010 18:43:53 +0000 (-0800)
Subject: Merge branch 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.34-rc1~251
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f6a0b5cd34d6e922cc7258c5429fb0f17508ceb6;p=karo-tx-linux.git

Merge branch 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, setup: Don't skip mode setting for the standard VGA modes
  x86-64, setup: Inhibit decompressor output if video info is invalid
  x86, setup: When restoring the screen, update boot_params.screen_info
---

f6a0b5cd34d6e922cc7258c5429fb0f17508ceb6