Merge tag 'please-pull-mlock2' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Dec 2015 18:45:29 +0000 (10:45 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Dec 2015 18:45:29 +0000 (10:45 -0800)
Pull ia64 fix from Tony Luck:
 "Wire up mlock2() syscall for ia64"

* tag 'please-pull-mlock2' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  [IA64] Enable mlock2 syscall for ia64


Trivial merge