]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'x86/numa-fixes', 'x86/apic', 'x86/apm', 'x86/bitops', 'x86/build...
authorIngo Molnar <mingo@elte.hu>
Tue, 8 Jul 2008 07:16:56 +0000 (09:16 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 8 Jul 2008 07:16:56 +0000 (09:16 +0200)
commit9716a94c82f9379a54a9d4add5167502eb8e5c7f
treeaffbf0ff13f7522336f25505e8e7b5f12a34e705
parent4478e6d520ff7cf7d93082d80d702b0512c3181e
parentdfbdef10385598d1117b4a03141d6342c3a46d4a
parentb372ffeb9a05c25c5d0066cfc3a28fd04a060f62
parent19c84f73535906922a06c9ceb5a1ead42becb32a
parent350681304fa251ad78f22903b5949c3708c95a14
parent180b06eeb9f6af6a511d1e5ad915b680933a2d00
parentc305df99420a83ad3d4ed166de799412ff54bf76
parentfadc13ea960490168afaf8224a5fce15decb25b9
parent3dff86d30d88d57ec0588ec4200d4c7f7248ea7d
parent77fbad0e737de2250d3fa9a69fe462d74eb7e548
parent2c4076057d23e573e78ca2062a282c12084d0322
parentedfc4a2f8afed61ba9fab520f96757e75a7e2ab5
parent227b8bdf434df15d3b6a75d4eeb3e9bf20519aa0
parentb4e064328f0b14b8ccfd33d20cf480d5eac1314f
parent0a2281b2882ae61c36de84d466b1ff8391a2b01e
parentbf3c1a0802ac4fef22c2b8cd43e857df794f5871
parent486cb9204df4d1d1a7ad3804ec761f28754f6f67
parent5b5cf6c7f040f25319ff6ec77805360d161fcb31
parentaa0b2953fc56cdcedba9669a0c04afd6d9eb5948
parent9d81c8961849f88ed3a39cd4509d2b546952890d
parent4f0d1f9b1bf7130d6e36bab5f839b9485f70bd8c
parent240f2352014faf34dbfb77fdceade91e08b620d6
parenta0d04d379325cd01f00b9ea182cddaab0639dc4f
parent8e05593ffa6d02ce486438015bd839fe130788f9
Merge branches 'x86/numa-fixes', 'x86/apic', 'x86/apm', 'x86/bitops', 'x86/build', 'x86/cleanups', 'x86/cpa', 'x86/cpu', 'x86/defconfig', 'x86/gart', 'x86/i8259', 'x86/intel', 'x86/irqstats', 'x86/kconfig', 'x86/ldt', 'x86/mce', 'x86/memtest', 'x86/pat', 'x86/ptemask', 'x86/resumetrace', 'x86/threadinfo', 'x86/timers', 'x86/vdso' and 'x86/xen' into x86/devel
21 files changed:
arch/x86/Kconfig
arch/x86/kernel/Makefile
arch/x86/kernel/apic_32.c
arch/x86/kernel/apic_64.c
arch/x86/kernel/head_64.S
arch/x86/kernel/io_apic_32.c
arch/x86/kernel/io_apic_64.c
arch/x86/kernel/pci-dma.c
arch/x86/kernel/setup_64.c
arch/x86/kernel/smpboot.c
arch/x86/kernel/vmlinux_64.lds.S
arch/x86/mm/init_32.c
arch/x86/mm/init_64.c
arch/x86/mm/ioremap.c
arch/x86/mm/pageattr.c
arch/x86/xen/mmu.c
fs/proc/proc_misc.c
include/asm-x86/apic.h
include/asm-x86/nmi.h
include/asm-x86/page.h
include/asm-x86/pgtable.h