Merge tag 'seccomp-4.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees...
authorJames Morris <james.l.morris@oracle.com>
Wed, 27 Jan 2016 23:53:54 +0000 (10:53 +1100)
committerJames Morris <james.l.morris@oracle.com>
Wed, 27 Jan 2016 23:53:54 +0000 (10:53 +1100)

Trivial merge