Merge branches 'x86/alternatives', 'x86/cleanups', 'x86/commandline', 'x86/crashdump...
authorIngo Molnar <mingo@elte.hu>
Mon, 6 Oct 2008 16:17:07 +0000 (18:17 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 6 Oct 2008 16:17:07 +0000 (18:17 +0200)
commite496e3d645c93206faf61ff6005995ebd08cc39c
tree349ee5b7284f0224fd075979ea80cf6c358bab35
parentb159d7a989e53ab3529084348aa80441520b8575
parent5bbd4c3724008c93cf3efdfc38a3402e245ab506
parent175e438f7a2de9d94110046be48697969569736a
parent516cbf3730c49739629d66313b20bdc50c98aa2c
parentaf2d237bf574f89ae5a1b67f2556a324c8f64ff5
parent9b1568458a3ef006361710dc12848aec891883b5
parent5b7e41ff37267c35b0fcf9162ca0c32c3d8d2c5c
parent1befdefcf476d5eb2fb4243fdf4d996a376708b1
parenta03352d2c1dcb00970801fb8b800a39acd3103d9
parent7b22ff5344fda666e0938e5261ea7b9a3dfce497
parent2c7e9fd4c6cb7f4b0bc7162e9a30847e51a1ca1b
parent91030ca1e739696812242c807b112ee3981a14be
parentdd5523552c2897e3fde16fc2fc8f6332addf66ab
parentb3e15bdef689641e7f1bb03efbe56112c3ee82e2
parent20211e4d344729f4d4c93da37a590fc1c3a1fd9b
parentefd327a2d41214dded03cbfbb6d447530964cddd
parentc7ffa6c26277b403920e2255d10df849bd613380
parente51a1ac2dfca9ad869471e88f828281db7e810c0
parent5df45515512436a808d3476a90e83f2efb022422
parentd99e90164e6cf2eb85fa94d547d6336f8127a107
parente621bd18958ef5dbace3129ebe17a0a475e127d9
Merge branches 'x86/alternatives', 'x86/cleanups', 'x86/commandline', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/doc', 'x86/exports', 'x86/fpu', 'x86/gart', 'x86/idle', 'x86/mm', 'x86/mtrr', 'x86/nmi-watchdog', 'x86/oprofile', 'x86/paravirt', 'x86/reboot', 'x86/sparse-fixes', 'x86/tsc', 'x86/urgent' and 'x86/vmalloc' into x86-v28-for-linus-phase1
38 files changed:
Documentation/kernel-parameters.txt
arch/x86/Kconfig
arch/x86/boot/compressed/misc.c
arch/x86/kernel/alternative.c
arch/x86/kernel/apm_32.c
arch/x86/kernel/cpu/mtrr/main.c
arch/x86/kernel/crash_dump_64.c
arch/x86/kernel/pci-gart_64.c
arch/x86/kernel/process.c
arch/x86/kernel/process_32.c
arch/x86/kernel/process_64.c
arch/x86/kernel/setup.c
arch/x86/kernel/signal_64.c
arch/x86/kernel/smpboot.c
arch/x86/kernel/sys_x86_64.c
arch/x86/kernel/traps_64.c
arch/x86/kernel/tsc.c
arch/x86/kernel/vmi_32.c
arch/x86/mm/pageattr.c
arch/x86/xen/enlighten.c
include/asm-x86/apic.h
include/asm-x86/asm.h
include/asm-x86/elf.h
include/asm-x86/futex.h
include/asm-x86/gart.h
include/asm-x86/mach-rdc321x/gpio.h
include/asm-x86/mmu.h
include/asm-x86/msr.h
include/asm-x86/nmi.h
include/asm-x86/page_32.h
include/asm-x86/paravirt.h
include/asm-x86/pgtable-2level.h
include/asm-x86/pgtable-3level.h
include/asm-x86/pgtable.h
include/asm-x86/pgtable_32.h
include/asm-x86/pgtable_64.h
include/asm-x86/resume-trace.h
include/asm-x86/spinlock.h