From: Peter Maydell Date: Fri, 23 Jan 2015 13:24:17 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/otubo/tags/pull-seccomp-20150123' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a46b3aaf6bb038d4f6f192a84df204f10929e75c;p=qemu.git 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 --- a46b3aaf6bb038d4f6f192a84df204f10929e75c