]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitfbd33e5658d36fe1740fcd3274e54a65d1668d7b
tree6e5b6770f1e7281b216f0a306b94dff25a9ac2ee
parentd6bc2d289530c3722cc6133b8226402e9dd26189
parentccca59a7dba35f6b2ade19c0b4adab5f03426814
parent0485a98d7f6cf295cf5afe03f8814ee897cee543
parent1712e3310ab5115a9092bfd7c93a2961f6c8bdd7
parent7987990bfa6680fae750ddd1213ff7f42044956f
parent88ddcbca6a92eabed044ea41dfc2ace2f88e66a8
parent46c3df0faadf900490206fb6b68aec53237f04f3
parentd4f58a4d7e4d87b9ebdb3bb71ed30348d95d07f2
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