tree 626eecdf8425a38098090af3bf2825134d489e90
parent e74e25929ce4d4f5f5f4bae585b214bacef6960b
parent 918708245e92941df16a634dc201b407d12bcd91
author Linus Torvalds <torvalds@linux-foundation.org> 1365364795 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1365364795 -0700

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

Pull x86 fixes from Peter Anvin:
 "Two quite small fixes: one a build problem, and the other fixes
  seccomp filters on x32."

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: Fix rebuild with EFI_STUB enabled
  x86: remove the x32 syscall bitmask from syscall_get_nr()