Merge tag 'seccomp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux...
authorJames Morris <james.l.morris@oracle.com>
Tue, 27 Jun 2017 02:38:46 +0000 (12:38 +1000)
committerJames Morris <james.l.morris@oracle.com>
Tue, 27 Jun 2017 02:38:46 +0000 (12:38 +1000)

Trivial merge