git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 725c258 1149454)
Merge branch 'x86/apic' into x86-v28-for-linus-phase4-B
authorIngo Molnar <mingo@elte.hu>
Fri, 10 Oct 2008 17:50:00 +0000 (19:50 +0200)
committerIngo Molnar <mingo@elte.hu>
Sat, 11 Oct 2008 18:17:36 +0000 (20:17 +0200)
Conflicts:
arch/x86/kernel/apic_32.c
arch/x86/kernel/apic_64.c
arch/x86/kernel/setup.c
drivers/pci/intel-iommu.c
include/asm-x86/cpufeature.h
include/asm-x86/dma-mapping.h


Trivial merge
Pandora Kernel Repository