From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 23 May 2012 17:09:50 +0000 (-0700)
Subject: Merge branches 'x86-asm-for-linus', 'x86-cleanups-for-linus', 'x86-cpu-for-linus... 
X-Git-Tag: firefly_0821_release~3680^2~2808
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=19bec32d7f26f263dba13f2797d9c3245de2020b;p=firefly-linux-kernel-4.4.55.git

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./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
---

19bec32d7f26f263dba13f2797d9c3245de2020b
diff --cc Makefile
index 546515cd07f3,9e384ae6c403,6f7328bca9c4,9e384ae6c403,9e384ae6c403,9e384ae6c403..8e4131bc352e
--- a/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*