summary refs log tree commit diff
path: root/arch/nios2
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-05-25 17:37:33 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-05-25 17:37:33 -0700
commit2f7c3a18a2dc79ddf7b83ae199b099a675e1adb2 (patch)
treec43795eb48dc102b25ef2bfd78dfc075ff93feaa /arch/nios2
parentf89eae4ee7e075e576bd4b4d2db901023421a3be (diff)
parentdc4fac84f8e66b147921ebdc385e767d5def7422 (diff)
downloadlinux-2f7c3a18a2dc79ddf7b83ae199b099a675e1adb2.tar.gz
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
 "Misc fixes: EFI, entry code, pkeys and MPX fixes, TASK_SIZE cleanups
  and a tsc frequency table fix"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mm: Switch from TASK_SIZE to TASK_SIZE_MAX in the page fault code
  x86/fsgsbase/64: Use TASK_SIZE_MAX for FSBASE/GSBASE upper limits
  x86/mm/mpx: Work around MPX erratum SKD046
  x86/entry/64: Fix stack return address retrieval in thunk
  x86/efi: Fix 7-parameter efi_call()s
  x86/cpufeature, x86/mm/pkeys: Fix broken compile-time disabling of pkeys
  x86/tsc: Add missing Cherrytrail frequency to the table
Diffstat (limited to 'arch/nios2')
0 files changed, 0 insertions, 0 deletions