diff options
author | Peter Maydell | 2018-06-14 14:16:20 +0200 |
---|---|---|
committer | Peter Maydell | 2018-06-14 14:16:20 +0200 |
commit | 666b0e732f694c995797e2a31ba19138ce4f69eb (patch) | |
tree | e9b1cbcd58800abf7a9a40f6420f2f90b795b0b2 /linux-user/syscall.c | |
parent | Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2018-06-13' into ... (diff) | |
parent | block: Ignore generated job QAPI files (diff) | |
download | qemu-666b0e732f694c995797e2a31ba19138ce4f69eb.tar.gz qemu-666b0e732f694c995797e2a31ba19138ce4f69eb.tar.xz qemu-666b0e732f694c995797e2a31ba19138ce4f69eb.zip |
Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
# gpg: Signature made Wed 13 Jun 2018 15:52:27 BST
# gpg: using RSA key BDBE7B27C0DE3057
# gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
# gpg: aka "Jeffrey Cody <jeff@codyprime.org>"
# gpg: aka "Jeffrey Cody <codyprime@gmail.com>"
# Primary key fingerprint: 9957 4B4D 3474 90E7 9D98 D624 BDBE 7B27 C0DE 3057
* remotes/cody/tags/block-pull-request:
block: Ignore generated job QAPI files
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/syscall.c')
0 files changed, 0 insertions, 0 deletions