diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2013-06-18 10:06:39 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-06-18 10:06:39 -0500 |
commit | 7d8f4b34a4bb6996d958da211f1dfb2686c7d82b (patch) | |
tree | 73af8d72adc7382be7d9119237ac3568772ce97f /blockjob.c | |
parent | 5b456438f5bb395ed6b1eec95e18ce7a7a884a0a (diff) | |
parent | 23307908790cd8fad91220863d7712c571ddc977 (diff) | |
download | qemu-7d8f4b34a4bb6996d958da211f1dfb2686c7d82b.tar.gz qemu-7d8f4b34a4bb6996d958da211f1dfb2686c7d82b.tar.bz2 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 'blockjob.c')
0 files changed, 0 insertions, 0 deletions