Merge branches 'x86/cleanups', 'x86/cpu', 'x86/debug', 'x86/mce2', 'x86/mm', 'x86/mtrr', 'x86/setup', 'x86/setup-memory', 'x86/urgent', 'x86/uv', 'x86/x2apic' and 'linus' into x86/core - linux - linux

summary refs log tree commit diff stats

path: root/arch

diff options

author	Ingo Molnar <mingo@elte.hu>	2009-03-18 13:19:49 +0100
committer	Ingo Molnar <mingo@elte.hu>	2009-03-18 13:19:49 +0100
commit	705bb9dc72b2464a7e421ee45d5e4a3f206d5c75 (patch)
tree	4ca54c86d3661b3a4ae2b63aa9ead20835a422d1 /arch
parent	x86: reduce preemption off section in exit thread (diff)
parent	x86/centaur: merge 32 & 64 bit version (diff)
parent	x86: cpu_debug add support for various AMD CPUs (diff)
parent	x86: use smp_call_function_single() in arch/x86/kernel/cpu/mcheck/mce_amd_64.c (diff)
parent	x86, mm: remove unnecessary include file from iomap_32.c (diff)
parent	x86: cpu/mttr/cleanup.c fix compilation warning (diff)
parent	x86, setup: move 32-bit code to .text32 (diff)
parent	x86-32: move _end to a dummy section (diff)
parent	x86, paravirt: prevent gcc from generating the wrong addressing mode (diff)
parent	x86, uv: fix cpumask iterator in uv_bau_init() (diff)
parent	x86: add x2apic_wrmsr_fence() to x2apic flush tlb paths (diff)
parent	Avoid 64-bit "switch()" statements on 32-bit architectures (diff)
download	linux-705bb9dc72b2464a7e421ee45d5e4a3f206d5c75.tar.xz linux-705bb9dc72b2464a7e421ee45d5e4a3f206d5c75.zip

Merge branches 'x86/cleanups', 'x86/cpu', 'x86/debug', 'x86/mce2', 'x86/mm', 'x86/mtrr', 'x86/setup', 'x86/setup-memory', 'x86/urgent', 'x86/uv', 'x86/x2apic' and 'linus' into x86/core

Conflicts: arch/parisc/kernel/irq.c