diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-23 19:09:50 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-23 19:09:50 +0200 |
| commit | 19bec32d7f26f263dba13f2797d9c3245de2020b (patch) | |
| tree | 05654892c9ae1cc0af8e8f5cfaf2fb6a321a38ac /arch/x86/kernel/nmi.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rku... (diff) | |
| parent | x86-64: Eliminate dead ia32 syscall handlers (diff) | |
| parent | x86/pci-calgary_64.c: Remove obsoleted simple_strtoul() usage (diff) | |
| parent | x86/cache_info: Fix setup of l2/l3 ids (diff) | |
| parent | x86: Avoid double stack traces with show_regs() (diff) | |
| parent | x86, microcode: microcode_core.c simple_strtoul cleanup (diff) | |
| download | linux-19bec32d7f26f263dba13f2797d9c3245de2020b.tar.xz linux-19bec32d7f26f263dba13f2797d9c3245de2020b.zip | |
Merge branches 'x86-asm-for-linus', 'x86-cleanups-for-linus', 'x86-cpu-for-linus', 'x86-debug-for-linus' and 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull initial trivial x86 stuff from Ingo Molnar.
Various random cleanups and trivial fixes.
* 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86-64: Eliminate dead ia32 syscall handlers
* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/pci-calgary_64.c: Remove obsoleted simple_strtoul() usage
x86: Don't continue booting if we can't load the specified initrd
x86: kernel/dumpstack.c simple_strtoul cleanup
x86: kernel/check.c simple_strtoul cleanup
debug: Add CONFIG_READABLE_ASM
x86: spinlock.h: Remove REG_PTR_MODE
* 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/cache_info: Fix setup of l2/l3 ids
* 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86: Avoid double stack traces with show_regs()
* 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, microcode: microcode_core.c simple_strtoul cleanup