OSDN Git Service

Merge remote-tracking branch 'remotes/otubo/tags/pull-seccomp-20150123' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 23 Jan 2015 13:24:17 +0000 (13:24 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 23 Jan 2015 13:24:17 +0000 (13:24 +0000)
commita46b3aaf6bb038d4f6f192a84df204f10929e75c
treec68ee4369cb95c272377d6063b7da1473fd3072c
parentc6441452b50c44fdbb362b239ce623f77cf3cd51
parent4b45b055491a319292beefb8080a81d96cf55cf6
Merge remote-tracking branch 'remotes/otubo/tags/pull-seccomp-20150123' into staging

seccomp branch queue

# gpg: Signature made Fri 23 Jan 2015 13:11:05 GMT using RSA key ID 12F8BD2F
# gpg: Can't check signature: public key not found

* remotes/otubo/tags/pull-seccomp-20150123:
  seccomp: add mlockall to whitelist

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>