Ingo Molnar 6e15cf0486 Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2 ...

Conflicts:
	arch/parisc/kernel/irq.c
	arch/x86/include/asm/fixmap_64.h
	arch/x86/include/asm/setup.h
	kernel/irq/handle.c

Semantic merge:
        arch/x86/include/asm/fixmap.h

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

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

..

acpi

Merge branches 'x86/acpi', 'x86/apic', 'x86/asm', 'x86/cleanups', 'x86/mm', 'x86/signal' and 'x86/urgent'; commit 'v2.6.29-rc6' into x86/core

2009-02-24 21:50:43 +01:00

apic

x86_32: apic/numaq_32, fix section mismatch

2009-03-02 12:00:25 +01:00

cpu

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

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

.gitignore

…

alternative.c

x86: make vmap yell louder when it is used under irqs_disabled()

2009-02-25 16:38:34 +01:00

amd_iommu_init.c

…

amd_iommu.c

…

aperture_64.c

…

apm_32.c

Merge branch 'linus' into x86/apic

2009-02-22 20:05:19 +01:00

asm-offsets_32.c

…

asm-offsets_64.c

…

asm-offsets.c

…

audit_64.c

…

bios_uv.c

…

bootflag.c

…

check.c

…

cpuid.c

…

crash_dump_32.c

…

crash_dump_64.c

…

crash.c

…

doublefault_32.c

…

ds.c

x86, pebs: correct qualifier passed to ds_write_config() from ds_request_pebs()

2009-03-06 16:13:15 +01:00

dumpstack_32.c

…

dumpstack_64.c

…

dumpstack.c

…

dumpstack.h

…

e820.c

x86: check range in reserve_early()

2009-02-24 22:43:15 +01:00

early_printk.c

…

early-quirks.c

…

efi_32.c

…

efi_64.c

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

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

efi_stub_32.S

Merge branch 'x86/asm' into x86/mm

2009-02-25 08:27:46 +01:00

efi_stub_64.S

x86: efi_stub_32,64 - add missing ENDPROCs

2009-02-24 18:08:40 +01:00

efi.c

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

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

entry_32.S

x86: minor cleanup in the espfix code

2009-02-23 11:34:04 -08:00

entry_64.S

Merge branch 'x86/asm' into x86/mm

2009-02-25 08:27:46 +01:00

ftrace.c

…

geode_32.c

…

head32.c

…

head64.c

…

head_32.S

…

head_64.S

x86: head_64.S - use IDT_ENTRIES instead of hardcoded number

2009-02-24 18:08:38 +01:00

head.c

…

hpet.c

x86: hpet: stop HPET_COUNTER when programming periodic mode

2009-02-22 18:01:18 +01:00

i386_ksyms_32.c

…

i387.c

x86, math-emu: fix init_fpu for task != current

2009-03-04 20:33:16 +01:00

i8237.c

…

i8253.c

…

i8259.c

x86: refactor x86_quirks support

2009-02-23 00:08:11 +01:00

init_task.c

…

io_delay.c

…

ioport.c

x86-32: use non-lazy io bitmap context switching

2009-03-02 12:07:48 +01:00

irq_32.c

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

2009-02-24 21:52:45 +01:00

irq_64.c

…

irq.c

…

irqinit_32.c

x86: refactor x86_quirks support

2009-02-23 00:08:11 +01:00

irqinit_64.c

…

k8.c

…

kdebugfs.c

…

kgdb.c

…

kprobes.c

prevent boosting kprobes on exception address

2009-03-17 09:11:48 -07:00

kvm.c

…

kvmclock.c

x86: refactor x86_quirks support

2009-02-23 00:08:11 +01:00

ldt.c

…

machine_kexec_32.c

x86: kexec/i386: fix sparse warnings: Using plain integer as NULL pointer

2009-02-22 09:27:11 +01:00

machine_kexec_64.c

…

Makefile

x86: don't compile vsmp_64 for 32bit

2009-02-26 06:40:06 +01:00

mca_32.c

x86: refactor x86_quirks support

2009-02-23 00:08:11 +01:00

mfgpt_32.c

…

microcode_amd.c

…

microcode_core.c

…

microcode_intel.c

…

mmconf-fam10h_64.c

…

module_32.c

…

module_64.c

…

mpparse.c

x86: check mptable physptr with max_low_pfn on 32bit

2009-02-23 07:41:31 +01:00

msr.c

…

olpc.c

…

paravirt_patch_32.c

…

paravirt_patch_64.c

…

paravirt-spinlocks.c

…

paravirt.c

x86: refactor x86_quirks support

2009-02-23 00:08:11 +01:00

pci-calgary_64.c

…

pci-dma.c

…

pci-gart_64.c

…

pci-nommu.c

…

pci-swiotlb_64.c

…

pcspeaker.c

…

pmtimer_64.c

…

probe_roms_32.c

…

process_32.c

x86: unify chunks of kernel/process*.c

2009-03-02 12:07:48 +01:00

process_64.c

x86: unify chunks of kernel/process*.c

2009-03-02 12:07:48 +01:00

process.c

x86: unify chunks of kernel/process*.c

2009-03-02 12:07:48 +01:00

ptrace.c

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

pvclock.c

…

quirks.c

…

reboot_fixups_32.c

…

reboot.c

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

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

relocate_kernel_32.S

…

relocate_kernel_64.S

…

rtc.c

…

scx200_32.c

…

setup_percpu.c

percpu: generalize embedding first chunk setup helper

2009-03-10 16:27:48 +09:00

setup.c

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

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

signal.c

x86, signals: fix xine & firefox bustage

2009-03-03 09:03:12 +01:00

smp.c

…

smpboot.c

x86: apic: simplify secondary CPU wakeup methods

2009-02-26 13:58:26 +01:00

stacktrace.c

…

step.c

…

sys_i386_32.c

…

sys_x86_64.c

…

syscall_64.c

…

syscall_table_32.S

…

tce_64.c

…

test_nx.c

…

test_rodata.c

…

time_32.c

x86: refactor x86_quirks support

2009-02-23 00:08:11 +01:00

time_64.c

x86: Add IRQF_TIMER to legacy x86 timer interrupt descriptors

2009-02-22 10:27:49 -08:00

tlb_uv.c

x86: UV: remove uv_flush_tlb_others() WARN_ON

2009-03-08 11:17:15 +01:00

tls.c

…

tls.h

…

topology.c

…

trampoline_32.S

…

trampoline_64.S

…

trampoline.c

…

traps.c

x86-32: use non-lazy io bitmap context switching

2009-03-02 12:07:48 +01:00

tsc_sync.c

…

tsc.c

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

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

uv_irq.c

…

uv_sysfs.c

…

verify_cpu_64.S

…

visws_quirks.c

x86: refactor x86_quirks support

2009-02-23 00:08:11 +01:00

vm86_32.c

…

vmi_32.c

…

vmiclock_32.c

Merge branches 'x86/acpi', 'x86/apic', 'x86/asm', 'x86/cleanups', 'x86/mm', 'x86/signal' and 'x86/urgent'; commit 'v2.6.29-rc6' into x86/core

2009-02-24 21:50:43 +01:00

vmlinux_32.lds.S

…

vmlinux_64.lds.S

…

vmlinux.lds.S

…

vsmp_64.c

x86: don't compile vsmp_64 for 32bit

2009-02-26 06:40:06 +01:00

vsyscall_64.c

…

x8664_ksyms_64.c

…

xsave.c

…