The following changes since commit 750036a848ea913ba6343718ffa70da98f7eef6b:
Merge remote-tracking branch 'remotes/afaerber/tags/prep-for-upstream' into staging (2014-03-12 17:53:37 +0000) are available in the git repository at: git://github.com/otubo/qemu.git seccomp for you to fetch changes up to 156e1fe648a4ac9391e974d430f2935a2911c512 Felix Geyer (1): seccomp: add timerfd_create and timerfd_settime to the whitelist Paul Moore (1): seccomp: add shmctl(), mlock(), and munlock() to the syscall whitelist qemu-seccomp.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)