From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 14 Oct 2014 00:28:16 +0000 (+0200)
Subject: Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: firefly_0821_release~176^2~3047
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2fd7476de999124bbf6830aa59ac092c882280fe;p=firefly-linux-kernel-4.4.55.git

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

Pull x86 fixes from Ingo Molnar:
 "Misc smaller fixes that missed the v3.17 cycle"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/build: Add arch/x86/purgatory/ make generated files to gitignore
  x86: Fix section conflict for numachip
  x86: Reject x32 executables if x32 ABI not supported
  x86_64, entry: Filter RFLAGS.NT on entry from userspace
  x86, boot, kaslr: Fix nuisance warning on 32-bit builds
---

2fd7476de999124bbf6830aa59ac092c882280fe