Merge tag 'seccomp-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux...
authorJames Morris <james.l.morris@oracle.com>
Sat, 19 Jul 2014 07:40:49 +0000 (17:40 +1000)
committerJames Morris <james.l.morris@oracle.com>
Sat, 19 Jul 2014 07:40:49 +0000 (17:40 +1000)

Trivial merge