Stephen Rothwell 25c1a411e8 x86: fix mismerge in arch/x86/include/asm/timer.h ...

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2009-03-30 10:10:49 -07:00

..

boot

Merge branches 'x86/apic', 'x86/cpu', 'x86/fixmap', 'x86/mm', 'x86/sched', 'x86/setup-lzma', 'x86/signal' and 'x86/urgent' into x86/core

2009-03-04 02:22:31 +01:00

configs

Merge branches 'x86/apic', 'x86/defconfig', 'x86/memtest', 'x86/mm' and 'linus' into x86/core

2009-02-26 06:31:32 +01:00

crypto

…

ia32

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

2009-03-28 04:26:01 +01:00

include/asm

x86: fix mismerge in arch/x86/include/asm/timer.h

2009-03-30 10:10:49 -07:00

kernel

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

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

kvm

KVM: VMX: Don't allow uninhibited access to EFER on i386

2009-03-24 11:03:15 +02:00

lguest

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

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

lib

…

math-emu

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

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

mm

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

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

oprofile

x86: oprofile: don't set counter width from cpuid on Core2

2009-03-03 12:04:22 +01:00

pci

…

power

…

vdso

…

video

…

xen

Merge branch 'x86/core' into core/percpu

2009-03-04 02:29:19 +01:00

Kconfig

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

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

Kconfig.cpu

…

Kconfig.debug

…

Makefile

…

Makefile_32.cpu

…