diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-07 01:22:59 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-07 01:22:59 +0200 |
commit | 75cb5fdce29c77ec54db45f0c6be7cc5715f8e15 (patch) | |
tree | ffc1d292d9b26a02d76f517c591f78b2aa8b576d /arch/x86/include/asm/system.h | |
parent | Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwe... (diff) | |
parent | x86: Clean up arch/x86/kernel/cpu/mtrr/cleanup.c: use ";" not "," to terminat... (diff) | |
parent | x86, vmware: Preset lpj values when on VMware. (diff) | |
parent | x86, mtrr: Use stop machine context to rendezvous all the cpu's (diff) | |
parent | x86/apic/es7000_32: Remove unused variable (diff) | |
parent | x86: Avoid unnecessary __clear_user() and xrstor in signal handling (diff) | |
parent | x86, vdso: Unmap vdso pages (diff) | |
download | linux-75cb5fdce29c77ec54db45f0c6be7cc5715f8e15.tar.xz linux-75cb5fdce29c77ec54db45f0c6be7cc5715f8e15.zip |
Merge branches 'x86-cleanups-for-linus', 'x86-vmware-for-linus', 'x86-mtrr-for-linus', 'x86-apic-for-linus', 'x86-fpu-for-linus' and 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Clean up arch/x86/kernel/cpu/mtrr/cleanup.c: use ";" not "," to terminate statements
* 'x86-vmware-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, vmware: Preset lpj values when on VMware.
* 'x86-mtrr-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, mtrr: Use stop machine context to rendezvous all the cpu's
* 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86/apic/es7000_32: Remove unused variable
* 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Avoid unnecessary __clear_user() and xrstor in signal handling
* 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, vdso: Unmap vdso pages