Merge branch 'linus' into core/softlockup
[linux-2.6] / arch / x86 / kernel / acpi / realmode / video-vga.c
1 #include "../../../boot/video-vga.c"