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

tracing: Rename FTRACE_SYSCALLS for tracepoints

2009-08-26 00:17:35 +02:00

crypto

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2009-12-01 15:16:22 +08:00

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

lguest: move panic notifier registration to its expected place.

2009-09-23 22:26:44 +09:30

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

Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2

2009-03-27 17:28:43 +01:00

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

hw-breakpoints: Rewrite the hw-breakpoints layer on top of perf events

2009-11-08 15:34:42 +01:00

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

sysctl x86: Remove dead binary sysctl support

2009-11-12 02:05:04 -08:00

video

…

xen

x86: xen: 64-bit kernel RPL should be 0

2010-01-13 11:23:54 +01:00

Kbuild

x86: standardize Kbuild rules

2009-04-16 18:09:02 +02:00

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

Merge branch 'perf/core' into perf/probes

2009-11-17 10:17:47 +01:00

Makefile_32.cpu

Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-12-08 13:38:11 -08:00