| commit | f6a0b5cd34d6e922cc7258c5429fb0f17508ceb6 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Feb 28 10:43:53 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Feb 28 10:43:53 2010 -0800 |
| tree | 0fae4978f63219b30ae0039a6a05c93df950fd37 | |
| parent | d6cd4715e21508bebbb1928c91d628bd65f5de5f [diff] | |
| parent | 8e92dc767abb58357e696a48fc3d8ce615a9c01a [diff] |
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