summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-04-07 12:59:55 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-07 12:59:55 -0700
commit39ab967e1d090e36ed49adce9ad82f57c91adbb6 (patch)
tree626eecdf8425a38098090af3bf2825134d489e90 /net
parente74e25929ce4d4f5f5f4bae585b214bacef6960b (diff)
parent918708245e92941df16a634dc201b407d12bcd91 (diff)
downloadlinux-3.10-39ab967e1d090e36ed49adce9ad82f57c91adbb6.tar.gz
linux-3.10-39ab967e1d090e36ed49adce9ad82f57c91adbb6.tar.bz2
linux-3.10-39ab967e1d090e36ed49adce9ad82f57c91adbb6.zip
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()
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions