Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6
[linux-2.6] / arch / x86 / kernel / acpi / realmode / video-vga.c
1 #include "../../../boot/video-vga.c"