]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
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)
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.


Trivial merge