projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 93156ce e3f9bb0)
Merge remote-tracking branch 'remotes/otubo/seccomp' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 28 Apr 2014 13:14:35 +0000 (14:14 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 28 Apr 2014 13:14:35 +0000 (14:14 +0100)
* 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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.