Merge branch 'x86/cleanups' into x86/apic
authorIngo Molnar <mingo@kernel.org>
Fri, 15 Jun 2012 12:16:54 +0000 (14:16 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 15 Jun 2012 12:17:01 +0000 (14:17 +0200)
commit879060d5745250c6f38304fd548d42b76f9df093
treef28ad110cb52cc2b4f93aeb552ceb54317efbbfb
parent5a0a2a308113086cc800a203d903271c9caa1611
parentfbd24153c48b8425b09c161a020483cd77da870e
Merge branch 'x86/cleanups' into x86/apic

Merge in the cleanups because a followup x86/apic change relies on them.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/kernel/apic/io_apic.c
arch/x86/kernel/setup.c
arch/x86/platform/uv/uv_irq.c