Merge tag 'seccomp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux...
authorJames Morris <james.l.morris@oracle.com>
Mon, 20 Jul 2015 07:19:19 +0000 (17:19 +1000)
committerJames Morris <james.l.morris@oracle.com>
Mon, 20 Jul 2015 07:19:19 +0000 (17:19 +1000)
1  2 
kernel/seccomp.c

Simple merge