Merge branch 'linus' into x86/urgent
commitbfefb7a0c6e08736f2d5917c468467f134bf28bb
authorIngo Molnar <mingo@elte.hu>
Sun, 20 Sep 2009 18:24:58 +0000 (20 20:24 +0200)
committerIngo Molnar <mingo@elte.hu>
Sun, 20 Sep 2009 18:25:03 +0000 (20 20:25 +0200)
tree7aa7084114dc083fe5b4d7b532901bdeb67188e7
parent8d0cc631f6dd0a9283ceb7d61d8b85ecbcd355ea
parent78f28b7c555359c67c2a0d23f7436e915329421e
Merge branch 'linus' into x86/urgent

Merge reason: Bring in changes that the next patch will depend on.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/include/asm/apic.h
arch/x86/kernel/apic/apic.c
arch/x86/kernel/apic/io_apic.c
arch/x86/kernel/setup.c
arch/x86/kernel/tsc.c