From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 28 Apr 2014 13:14:35 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/otubo/seccomp' into staging
X-Git-Tag: qemu-xen-4.6.0-rc1~487
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=e2da502c003b9a91b4aea7684959192bd07c1f1d;p=qemu-xen.git

Merge remote-tracking branch 'remotes/otubo/seccomp' into staging

* remotes/otubo/seccomp:
  seccomp: add shmctl(), mlock(), and munlock() to the syscall whitelist
  seccomp: add timerfd_create and timerfd_settime to the whitelist

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

e2da502c003b9a91b4aea7684959192bd07c1f1d