1
linux/arch/x86
H. Peter Anvin d02e30c31c Merge branch 'x86/irq' into x86/apic
Merge reason:
	Conflicts in arch/x86/kernel/apic/io_apic.c

Resolved Conflicts:
	arch/x86/kernel/apic/io_apic.c

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2010-02-22 16:20:34 -08:00
..
boot x86: add support for LZO-compressed kernels 2010-01-11 09:34:05 -08:00
configs
crypto
ia32 x86, ia32_aout: do not kill argument mapping 2010-02-10 12:03:34 -08:00
include/asm Merge branch 'x86/irq' into x86/apic 2010-02-22 16:20:34 -08:00
kernel Merge branch 'x86/irq' into x86/apic 2010-02-22 16:20:34 -08:00
kvm KVM: PIT: control word is write-only 2010-02-09 19:20:15 +02:00
lguest
lib Merge branch 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into x86/urgent 2009-12-28 09:23:13 +01:00
math-emu
mm Merge branch 'x86/urgent' into x86/irq 2010-02-20 22:54:05 -08:00
oprofile oprofile/x86: add Xeon 7500 series support 2010-01-25 15:34:53 +01:00
pci x86/PCI: remove IOH range fetching 2010-01-28 08:24:11 -08:00
power
tools Merge branch 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into x86/urgent 2009-12-28 09:23:13 +01:00
vdso
video
xen x86: xen: 64-bit kernel RPL should be 0 2010-01-13 11:23:54 +01:00
Kbuild
Kconfig x86: Remove "x86 CPU features in debugfs" (CONFIG_X86_CPU_DEBUG) 2010-01-23 18:27:47 -08:00
Kconfig.cpu Revert "x86: Side-step lguest problem by only building cmpxchg8b_emu for pre-Pentium" 2010-01-05 16:01:35 -08:00
Kconfig.debug Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2009-12-11 20:47:30 -08:00
Makefile
Makefile_32.cpu