aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/apic/x2apic_uv_x.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-02-28 10:43:53 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-02-28 10:43:53 -0800
commitf6a0b5cd34d6e922cc7258c5429fb0f17508ceb6 (patch)
tree0fae4978f63219b30ae0039a6a05c93df950fd37 /arch/x86/kernel/apic/x2apic_uv_x.c
parentMerge branch 'x86-rwsem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff)
parentx86, setup: Don't skip mode setting for the standard VGA modes (diff)
downloadlinux-dev-f6a0b5cd34d6e922cc7258c5429fb0f17508ceb6.tar.xz
linux-dev-f6a0b5cd34d6e922cc7258c5429fb0f17508ceb6.zip
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
Diffstat (limited to 'arch/x86/kernel/apic/x2apic_uv_x.c')
0 files changed, 0 insertions, 0 deletions