summary refs log tree commit diff stats
path: root/slirp/tcp_input.c
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2013-06-18 10:06:39 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2013-06-18 10:06:39 -0500
commit7d8f4b34a4bb6996d958da211f1dfb2686c7d82b (patch)
tree73af8d72adc7382be7d9119237ac3568772ce97f /slirp/tcp_input.c
parent5b456438f5bb395ed6b1eec95e18ce7a7a884a0a (diff)
parent23307908790cd8fad91220863d7712c571ddc977 (diff)
downloadfocaccia-qemu-7d8f4b34a4bb6996d958da211f1dfb2686c7d82b.tar.gz
focaccia-qemu-7d8f4b34a4bb6996d958da211f1dfb2686c7d82b.zip
Merge remote-tracking branch 'bonzini/nbd-next' into staging
# By Ján Tomko
# Via Paolo Bonzini
* bonzini/nbd-next:
  nbd: strip braces from literal IPv6 address in URI
  qemu-socket: allow hostnames starting with a digit
Diffstat (limited to 'slirp/tcp_input.c')
0 files changed, 0 insertions, 0 deletions