Merge branch 'linus' into x86/cleanups
authorIngo Molnar <mingo@elte.hu>
Fri, 2 Jan 2009 21:41:36 +0000 (22:41 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 2 Jan 2009 21:41:36 +0000 (22:41 +0100)
commit923a789b49c7269a0245d5af6afe486188d940df
treec3f168427372e64f7467a794f313416da5086ba0
parent103ceffb9501531f6931df6aebc11a05189201f0
parentb840d79631c882786925303c2b0f4fefc31845ed
Merge branch 'linus' into x86/cleanups

Conflicts:
arch/x86/kernel/reboot.c
arch/x86/kernel/apic.c
arch/x86/kernel/cpu/mtrr/main.c
arch/x86/kernel/genx2apic_phys.c
arch/x86/kernel/io_apic.c
arch/x86/kernel/reboot.c
arch/x86/kernel/traps.c