From: Peter Maydell Date: Thu, 22 Sep 2016 12:18:29 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/otubo/tags/pull-seccomp-20160921' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3648100e2af88765ba14347a0c74c8a5eb093eb5;p=qemu.git Merge remote-tracking branch 'remotes/otubo/tags/pull-seccomp-20160921' into staging seccomp branch queue # gpg: Signature made Wed 21 Sep 2016 10:30:09 BST # gpg: using RSA key 0xFD0CFF5B12F8BD2F # gpg: Good signature from "Eduardo Otubo (Software Engineer @ ProfitBricks) " # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: 1C96 46B6 E1D1 C38A F2EC 3FDE FD0C FF5B 12F8 BD2F * remotes/otubo/tags/pull-seccomp-20160921: seccomp: adding getrusage to the whitelist Signed-off-by: Peter Maydell --- 3648100e2af88765ba14347a0c74c8a5eb093eb5