From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 2 Mar 2014 04:48:14 +0000 (-0600)
Subject: Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.14-rc5~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=55de1ed2f597646c6c7f0bbe2da1680c760b0d40;p=kernel%2Fkernel-generic.git

Merge branch 'x86-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 fixes from Peter Anvin:
 "The VMCOREINFO patch I'll pushing for this release to avoid having a
  release with kASLR and but without that information.

  I was hoping to include the FPU patches from Suresh, but ran into a
  problem (see other thread); will try to make them happen next week"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, kaslr: add missed "static" declarations
  x86, kaslr: export offset in VMCOREINFO ELF notes
---

55de1ed2f597646c6c7f0bbe2da1680c760b0d40