Merge branches 'x86/acpi', 'x86/asm', 'x86/cpudetect', 'x86/crashdump', 'x86/debug...
authorIngo Molnar <mingo@elte.hu>
Fri, 13 Feb 2009 08:46:36 +0000 (09:46 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 13 Feb 2009 08:46:36 +0000 (09:46 +0100)
commita56cdcb662032a732f7c4f35cc5a9acf37759d8c
tree6e5b6770f1e7281b216f0a306b94dff25a9ac2ee
parent881c47760bc66b43360337da37d2a9de4af865b0
parent8e1568f3500287d0b36c9776132cb53a42d5651d
parent063f8913afb48842b9329e195d90d2c28e58aacc
parentf5deb79679af6eb41b61112fadcda28b2a4cfb0d
parent2c344e9d6e1938fdf15e93c56d6fe42f8410e9d3
parentbd282422fe9566a89bc34af325efb6d2701903be
parentd88316c243e5458a1888edbe0353c4dec6e61c73
parent39ba5d43fc9133696240fc8b6b13e7a41fea87cd
Merge branches 'x86/acpi', 'x86/asm', 'x86/cpudetect', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/doc', 'x86/header-fixes', 'x86/headers' and 'x86/minor-fixes' into x86/core
12 files changed:
arch/x86/configs/i386_defconfig
arch/x86/configs/x86_64_defconfig
arch/x86/include/asm/io.h
arch/x86/include/asm/io_32.h
arch/x86/include/asm/io_64.h
arch/x86/include/asm/page.h
arch/x86/include/asm/pgtable.h
arch/x86/include/asm/pgtable_64.h
arch/x86/kernel/acpi/boot.c
arch/x86/kernel/apic.c
arch/x86/kernel/es7000_32.c
arch/x86/mm/init_32.c