Merge branch 'kvm-updates/2.6.34' of git://git.kernel.org/pub/scm/virt/kvm/kvm
[safe/jmp/linux-2.6] / arch / x86 / include / asm / vga.h
2008-10-23 H. Peter Anvinx86: Fix ASM_X86__ header guards
2008-10-23 Al Virox86, um: ... and asm-x86 move