diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-07-11 14:10:09 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-07-11 14:10:09 +0100 |
| commit | b3b22db69fdefbde00a4499453b76c6b57464711 (patch) | |
| tree | 9373a354917828ced43dbd0a0e2ccaa528f11dd3 /slirp/tcp_subr.c | |
| parent | f7d3f8c0c0737b3b99a45b46ea23f4ab15cdb135 (diff) | |
| parent | cdbd727c20ad7aac7797dc8c95e485e1a4c6901b (diff) | |
| download | focaccia-qemu-b3b22db69fdefbde00a4499453b76c6b57464711.tar.gz focaccia-qemu-b3b22db69fdefbde00a4499453b76c6b57464711.zip | |
Merge remote-tracking branch 'remotes/rth/tags/pull-rth-20160710' into staging
build fix for travis # gpg: Signature made Sun 10 Jul 2016 18:07:02 BST # gpg: using RSA key 0xAD1270CC4DD0279B # gpg: Good signature from "Richard Henderson <rth7680@gmail.com>" # gpg: aka "Richard Henderson <rth@redhat.com>" # gpg: aka "Richard Henderson <rth@twiddle.net>" # Primary key fingerprint: 9CB1 8DDA F8E8 49AD 2AFC 16A4 AD12 70CC 4DD0 279B * remotes/rth/tags/pull-rth-20160710: build: Use $(AS) for optionrom explicitly linux-user: Fix i386 safe-syscall.S Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'slirp/tcp_subr.c')
0 files changed, 0 insertions, 0 deletions