diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-20 02:49:35 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-20 02:49:35 +0200 |
commit | 17b141803c6c6e27fbade3f97c1c9d8d66c72866 (patch) | |
tree | 23ecc0e41e4b742883ee800a4725beff234d2eaa /arch/x86/kernel/ptrace.c | |
parent | Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
parent | x86, apic: Print verbose error interrupt reason on apic=debug (diff) | |
parent | x86: Demacro CONFIG_PARAVIRT cpu accessors (diff) | |
parent | x86: Fix mrst sparse complaints (diff) | |
download | linux-17b141803c6c6e27fbade3f97c1c9d8d66c72866.tar.xz linux-17b141803c6c6e27fbade3f97c1c9d8d66c72866.zip |
Merge branches 'x86-apic-for-linus', 'x86-asm-for-linus' and 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, apic: Print verbose error interrupt reason on apic=debug
* 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Demacro CONFIG_PARAVIRT cpu accessors
* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Fix mrst sparse complaints
x86: Fix spelling error in the memcpy() source code comment
x86, mpparse: Remove unnecessary variable