projects / sdk / emulator / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commite2da502c003b9a91b4aea7684959192bd07c1f1d
treedd40855c9ddbc53d4c537c0a1705fab4e8984875tree | snapshot
parent93156cef1c9008a549de5fa430b9c6b3d2f5e43bcommit | diff
parente3f9bb011ae24a594310fa4917754945dc832f8fcommit | diff
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>
Domain: SDK / Emulator;