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 - linux

diff options

author	Ingo Molnar <mingo@elte.hu>	2008-10-06 18:17:07 +0200
committer	Ingo Molnar <mingo@elte.hu>	2008-10-06 18:17:07 +0200
commit	e496e3d645c93206faf61ff6005995ebd08cc39c (patch)
tree	349ee5b7284f0224fd075979ea80cf6c358bab35 /arch/x86/kernel/alternative.c
parent	Merge branch 'x86/tracehook' into x86-v28-for-linus-phase1 (diff)
parent	x86: spinlock use LOCK_PREFIX (diff)
parent	x86: trivial printk fix in efi.c (diff)
parent	x86, bootup: add built-in kernel command line for x86 (v2) (diff)
parent	x86: check for ioremap() failure in copy_oldmem_page() (diff)
parent	x86, debug printouts: IOMMU setup failures should not be KERN_ERR (diff)
parent	x86: additional defconfig updates (diff)
parent	x86: remove 8254 timer texts from Documentation (diff)
parent	x86: export set_memory_ro and set_memory_rw (diff)
parent	x86 gart: allocate size-aligned address for alloc_coherent, v2 (diff)
parent	x86: make poll_idle behave more like the other idle methods (diff)
parent	x86: unsigned long pte_pfn (diff)
parent	x86: mtrr_cleanup: treat WRPROT as UNCACHEABLE (diff)
parent	x86, NMI watchdog: setup before enabling NMI watchdog (diff)
parent	x86: Coding style fixes to arch/x86/oprofile/op_model_p4.c (diff)
parent	x86/paravirt: Remove duplicate paravirt_pagetable_setup_{start, done}() (diff)
parent	x86: default to reboot via ACPI (diff)
parent	x86, olpc: fix endian bug in openfirmware workaround (diff)
parent	x86, tsc calibration: fix (diff)
parent	x86: gart iommu have direct mapping when agp is present too (diff)
parent	i386: vmalloc size fix (diff)
download	linux-e496e3d645c93206faf61ff6005995ebd08cc39c.tar.xz linux-e496e3d645c93206faf61ff6005995ebd08cc39c.zip

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


context:
space:
mode: