tree 21d99ac3a8314fc513b6e58831d6e169d337e17d
parent eee045021fb22aeac7f5d6f2092430b530c880ee
parent 103502a35cfce0710909da874f092cb44823ca03
author James Morris <james.l.morris@oracle.com> 1453938834 +1100
committer James Morris <james.l.morris@oracle.com> 1453938834 +1100

Merge tag 'seccomp-4.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into for-linus