Arjan van de Ven 651dab4264 Merge commit 'linus/master' into merge-linus ... Conflicts: arch/x86/kvm/i8254.c		2008-10-17 09:20:26 -07:00
..
i8254.c
i8254.h
i8259.c
irq.c
irq.h
Kconfig
kvm_cache_regs.h
kvm_svm.h
lapic.c
lapic.h
Makefile
mmu.c
mmu.h
paging_tmpl.h
svm.c
svm.h
tss.h
vmx.c
vmx.h
x86_emulate.c
x86.c
x86.h