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)
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>

Trivial merge