Merge branch 'x86/cleanups' into irq/sparseirq
authorThomas Gleixner <tglx@linutronix.de>
Tue, 12 Oct 2010 14:40:34 +0000 (16:40 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Tue, 12 Oct 2010 14:40:42 +0000 (16:40 +0200)
commit5e62feabcc3e4127a084701ec54ffe891985b7e8
tree9246462da99ef4eb53c9c89a137d0a88c897f3d6
parent8ffcfa4e2d96342180e02dfe1230b97778c52d72
parent234bb549eea16ec7d5207ba747fb8dbf489e64c1
Merge branch 'x86/cleanups' into irq/sparseirq

Reason: Avoid conflicts with removal of boot_cpu_id

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
arch/x86/kernel/apic/io_apic.c
arch/x86/kernel/cpu/amd.c
arch/x86/kernel/early-quirks.c
arch/x86/kernel/setup.c