| commit | f84d587111cc165f0aa6aa49e434fb3afc897c2d | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Tue, 15 Mar 2016 15:51:06 +0000 (15 15:51 +0000) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Tue, 15 Mar 2016 15:51:06 +0000 (15 15:51 +0000) | ||
| tree | 5f76f4ceb397565cc2333595d091cef0ec0611d0 | treesnapshot (tar.gz zip) |
| parent | d41e0bed7ba7bad87b4e0cedf5580f29ee1a311f | commitdiff |
| parent | cfd47a71df51047833d182e9e97244e7816b57da | commitdiff |
Merge remote-tracking branch 'remotes/berrange/tags/pull-io-next-2016-03-15-1' into staging
Merge I/O fixes
# gpg: Signature made Tue 15 Mar 2016 14:42:43 GMT using RSA key ID 15104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg: aka "Daniel P. Berrange <berrange@redhat.com>"
* remotes/berrange/tags/pull-io-next-2016-03-15-1:
io: stronger check for support for IPv4/6
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Merge I/O fixes
# gpg: Signature made Tue 15 Mar 2016 14:42:43 GMT using RSA key ID 15104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg: aka "Daniel P. Berrange <berrange@redhat.com>"
* remotes/berrange/tags/pull-io-next-2016-03-15-1:
io: stronger check for support for IPv4/6
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>