git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ba1a96f 4ea48a0)
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Oct 2014 00:28:16 +0000 (02:28 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Oct 2014 00:28:16 +0000 (02:28 +0200)
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

1  2 
arch/x86/boot/compressed/aslr.c patch | diff1 | diff2 | blob | history
arch/x86/kernel/cpu/common.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/boot/compressed/aslr.c
Simple merge
diff --cc arch/x86/kernel/cpu/common.c
Simple merge
Pandora Kernel Repository