tree 9246462da99ef4eb53c9c89a137d0a88c897f3d6
parent 8ffcfa4e2d96342180e02dfe1230b97778c52d72
parent 234bb549eea16ec7d5207ba747fb8dbf489e64c1
author Thomas Gleixner <tglx@linutronix.de> 1286894434 +0200
committer Thomas Gleixner <tglx@linutronix.de> 1286894442 +0200

Merge branch 'x86/cleanups' into irq/sparseirq

Reason: Avoid conflicts with removal of boot_cpu_id

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>