| commit | f6a0b5cd34d6e922cc7258c5429fb0f17508ceb6 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sun, 28 Feb 2010 18:43:53 +0000 (28 10:43 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sun, 28 Feb 2010 18:43:53 +0000 (28 10:43 -0800) | ||
| tree | 0fae4978f63219b30ae0039a6a05c93df950fd37 | treesnapshot (tar.gz zip) |
| parent | d6cd4715e21508bebbb1928c91d628bd65f5de5f | commitdiff |
| parent | 8e92dc767abb58357e696a48fc3d8ce615a9c01a | commitdiff |
Merge branch 'x86-setup-for-linus' of git://git./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
* '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
| arch/x86/boot/compressed/misc.c | diff1 | diff2 | blobhistory |