Merge branch 'linus' into x86/irq
authorIngo Molnar <mingo@elte.hu>
Mon, 16 Jun 2008 09:27:45 +0000 (11:27 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 16 Jun 2008 09:27:45 +0000 (11:27 +0200)
commitd939d2851fd12568e2eabb2916769e8a57ba5c89
treef3158a5ddd41541a61126f9e48de1ce89c632f64
parent9f5314fb4d556d3132c784d0df47352b2830ca53
parent066519068ad2fbe98c7f45552b1f592903a9c8c8
Merge branch 'linus' into x86/irq
arch/x86/kernel/acpi/boot.c
arch/x86/kernel/entry_32.S
arch/x86/kernel/io_apic_32.c