Merge branches 'x86-asm-for-linus', 'x86-cleanups-for-linus', 'x86-cpu-for-linus...

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

diff --cc Makefile
index 546515cd07f30c5354946991ecd382b183a02471,9e384ae6c403cb92d3ed633b3e033bf3a6c3c3de,6f7328bca9c4270b969dd7e4a2702e1657bc796a,9e384ae6c403cb92d3ed633b3e033bf3a6c3c3de,9e384ae6c403cb92d3ed633b3e033bf3a6c3c3de,9e384ae6c403cb92d3ed633b3e033bf3a6c3c3de..8e4131bc352e409466032880bd51b303a4890a7d
--- 1/Makefile
--- 2/Makefile
--- 3/Makefile
--- 4/Makefile
--- 5/Makefile
--- 6/Makefile
+++ b/Makefile
@@@@@@@ -1,7 -1,7 -1,7 -1,7 -1,7 -1,7 +1,7 @@@@@@@
      VERSION = 3
  -   PATCHLEVEL = 3
  +   PATCHLEVEL = 4
      SUBLEVEL = 0
 - ---EXTRAVERSION = -rc6
 + +++EXTRAVERSION =
      NAME = Saber-toothed Squirrel
      
      # *DOCUMENTATION*

diff --cc arch/x86/kernel/dumpstack.c
Simple merge

diff --cc arch/x86/kernel/nmi.c
Simple merge

diff --cc arch/x86/kernel/pci-calgary_64.c
Simple merge

diff --cc arch/x86/kernel/process.c
Simple merge

diff --cc arch/x86/kernel/setup.c
Simple merge

diff --cc lib/Kconfig.debug
Simple merge