diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-23 21:09:50 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-23 21:09:50 +0400 |
| commit | 19bec32d7f26f263dba13f2797d9c3245de2020b (patch) | |
| tree | 05654892c9ae1cc0af8e8f5cfaf2fb6a321a38ac /arch/x86/kernel/nmi.c | |
| parent | 514b1923e1549162f1597f81113c0e5b72aed691 (diff) | |
| parent | fba60c620a6a9ec11140c179e5d0fe0bc3c3ea29 (diff) | |
| parent | 74bc491795420254f8b9c782ec654c9ba005d3ac (diff) | |
| parent | ddc5681ed33a279fdc188e98e71f0c539f08c6e6 (diff) | |
| parent | 57da8b960b9a25646a8ddb5a9c1d0b5978e69bec (diff) | |
| parent | e826abd523913f63eb03b59746ffb16153c53dc4 (diff) | |
| download | linux-19bec32d7f26f263dba13f2797d9c3245de2020b.tar.xz | |
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