Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 31 Dec 2015 22:46:49 +0000 (14:46 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 31 Dec 2015 22:46:49 +0000 (14:46 -0800)
commit7c672dd6016afdfca5ab87b1a32729c73236a3cd
tree97fdbf6721f33dacdfa11bca9e57c7359a8b880f
parent8f5daf2a49545374b5b433f0ee3ae62fc6e63d4d
parent42d85c52f88dd0d2159f531eb33cc66d6e3e60c0
Merge git://git./linux/kernel/git/davem/sparc

Pull sparc fixes from David Miller:
 "Just some missing syscall wire ups"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc: Wire up mlock2 system call.
  sparc: Add all necessary direct socket system calls.