]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit5e9fb84ce4f44955ade53831ca9875dded258440
treec3f168427372e64f7467a794f313416da5086ba0
parente91d252120dfc39aa7a2574d1e0c67d5a5c7e21d
parent4148ad5a98714d46a16d54fe712cb1cf54aa6176
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