Ingo Molnar 4369f1fb7c Merge branch 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into core/percpu ...

Conflicts:
	arch/x86/kernel/setup_percpu.c

Semantic conflict:

	arch/x86/kernel/cpu/common.c

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

2009-01-27 12:03:24 +01:00

..

boot

Merge branches 'x86/apic', 'x86/cleanups', 'x86/cpufeature', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/detect-hyper', 'x86/doc', 'x86/dumpstack', 'x86/early-printk', 'x86/fpu', 'x86/idle', 'x86/io', 'x86/memory-corruption-check', 'x86/microcode', 'x86/mm', 'x86/mtrr', 'x86/nmi-watchdog', 'x86/pat2', 'x86/pci-ioapic-boot-irq-quirks', 'x86/ptrace', 'x86/quirks', 'x86/reboot', 'x86/setup-memory', 'x86/signal', 'x86/sparse-fixes', 'x86/time', 'x86/uv' and 'x86/xen' into x86/core

2008-12-23 16:27:23 +01:00

configs

eeprom: More consistent symbol names

2009-01-26 21:19:57 +01:00

crypto

crypto: crc32c-intel - Switch to shash

2008-12-25 11:01:37 +11:00

ia32

x86-64: Move kernelstack from PDA to per-cpu.

2009-01-19 00:38:58 +09:00

include/asm

Merge branch 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into core/percpu

2009-01-27 12:03:24 +01:00

kernel

Merge branch 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into core/percpu

2009-01-27 12:03:24 +01:00

kvm

KVM: change KVM to use IOMMU API

2009-01-03 14:11:07 +01:00

lguest

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

2009-01-02 11:44:09 -08:00

lib

x86: use early clobbers in usercopy*.c

2009-01-21 09:43:17 +01:00

mach-default

x86: mach-default setup.c cleanups

2008-12-29 13:18:39 +01:00

mach-generic

x86: rename all fields of mpc_table mpc_X to X

2009-01-05 14:08:34 +01:00

mach-rdc321x

…

mach-voyager

x86: initialize per-cpu GDT segment in per-cpu setup

2009-01-27 12:56:48 +09:00

math-emu

…

mm

Merge branch 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into core/percpu

2009-01-27 12:03:24 +01:00

oprofile

Merge branch 'oprofile/ring_buffer' into oprofile/oprofile-for-tip

2009-01-08 14:27:34 +01:00

pci

x86 PAT: consolidate old memtype new memtype check into a function

2009-01-13 19:13:00 +01:00

power

x86, hibernate: fix breakage on x86_32 with CONFIG_NUMA set

2008-11-12 23:28:51 +01:00

vdso

Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

2008-12-28 12:33:21 -08:00

video

…

xen

x86: initialize per-cpu GDT segment in per-cpu setup

2009-01-27 12:56:48 +09:00

Kconfig

x86: make Voyager use x86 per-cpu setup.

2009-01-27 12:56:48 +09:00

Kconfig.cpu

x86: make x86_32 use tlb_64.c, build fix, clean up X86_L1_CACHE_BYTES

2009-01-21 11:17:11 +01:00

Kconfig.debug

Merge branch 'linus' into stackprotector

2008-12-31 08:31:57 +01:00

Makefile

Merge branch 'linus' into stackprotector

2008-12-31 08:31:57 +01:00

Makefile_32.cpu

x86: merge winchip-2 and winchip-2a cpu choices

2008-10-13 10:22:48 +02:00