Ingo Molnar 1c2a48cf65 Merge branch 'linus' into x86/apic-cleanups ...

Conflicts:
	arch/x86/include/asm/io_apic.h

Merge reason: Resolve the conflict, update to a more recent -rc base

Signed-off-by: Ingo Molnar <mingo@elte.hu>

2011-01-07 14:14:15 +01:00

..

boot

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

2011-01-06 10:56:02 -08:00

configs

defconfig reduction

2010-08-14 22:26:53 +02:00

crypto

crypto: ghash-intel - ghash-clmulni-intel_glue needs err.h

2010-12-15 19:44:08 +08:00

ia32

BKL: remove extraneous #include <smp_lock.h>

2010-11-17 08:59:32 -08:00

include/asm

Merge branch 'linus' into x86/apic-cleanups

2011-01-07 14:14:15 +01:00

kernel

Merge branch 'linus' into x86/apic-cleanups

2011-01-07 14:14:15 +01:00

kvm

KVM: i8259: initialize isr_ack

2011-01-02 11:52:48 +02:00

lguest

x86, mm: Initialize initial_page_table before paravirt jumps

2011-01-04 09:53:50 +01:00

lib

x86, mem: Optimize memmove for small size and unaligned cases

2010-09-24 18:57:11 -07:00

math-emu

x86, fpu: Unbreak FPU emulation

2010-05-10 13:37:16 -07:00

mm

Merge branch 'linus' into x86/apic-cleanups

2011-01-07 14:14:15 +01:00

oprofile

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

2011-01-06 11:05:21 -08:00

pci

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

2011-01-06 11:07:33 -08:00

platform

Merge branch 'linus' into x86/apic-cleanups

2011-01-07 14:14:15 +01:00

power

x86, tsc, sched: Recompute cyc2ns_offset's during resume from sleep states

2010-08-20 14:59:02 +02:00

tools

…

vdso

x86, gcc-4.6: Use gcc -m options when building vdso

2010-12-13 16:08:37 -08:00

video

…

xen

Merge branches 'x86-fixes-for-linus', 'perf-fixes-for-linus' and 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2010-12-08 06:40:59 -08:00

.gitignore

…

Kbuild

x86: Add platform directory

2010-10-27 14:30:01 +02:00

Kconfig

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

2011-01-06 11:06:31 -08:00

Kconfig.cpu

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

2010-05-18 08:58:16 -07:00

Kconfig.debug

x86: Add RO/NX protection for loadable kernel modules

2010-11-18 13:32:56 +01:00

Makefile

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

2010-10-21 13:06:00 -07:00

Makefile_32.cpu

jump label: Add work around to i386 gcc asm goto bug

2010-10-29 14:45:29 -04:00