diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2016-09-22 13:18:29 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2016-09-22 13:18:29 +0100 |
commit | 3648100e2af88765ba14347a0c74c8a5eb093eb5 (patch) | |
tree | f10b74e946074529b7b9180a6aeb7cb82662547f /ui | |
parent | ffd455ae41772d92a7c52f58eed3fb89f04b6a60 (diff) | |
parent | cf9dc9e4807464a9d0b3d7368b818323e14921eb (diff) | |
download | qemu-3648100e2af88765ba14347a0c74c8a5eb093eb5.zip |
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) <eduardo.otubo@profitbricks.com>"
# 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 <peter.maydell@linaro.org>
Diffstat (limited to 'ui')
0 files changed, 0 insertions, 0 deletions