diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-03-22 13:05:50 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-03-22 13:05:50 -0500 |
| commit | f9308207040dc4a1484cee459bedaec03645b935 (patch) | |
| tree | 3656182f69f8b0afdc346c311d07ffa446ce0508 /net/socket.c | |
| parent | afed26082219b49443193b4ac32d113bbcf967fd (diff) | |
| parent | fe42d7fb0f4a05fb393e1efbd681f33a0154c644 (diff) | |
| download | qemu-f9308207040dc4a1484cee459bedaec03645b935.zip qemu-f9308207040dc4a1484cee459bedaec03645b935.tar.gz qemu-f9308207040dc4a1484cee459bedaec03645b935.tar.bz2 | |
Merge remote-tracking branch 'cohuck/virtio-ccw-upstr' into staging
# By Cornelia Huck
# Via Cornelia Huck
* cohuck/virtio-ccw-upstr:
virtio-ccw, s390-virtio: Use generic virtio-blk macro.
s390-virtio, virtio-ccw: Add config_wce for virtio-blk.
virtio-ccw: Add missing blk chs properties.
Diffstat (limited to 'net/socket.c')
0 files changed, 0 insertions, 0 deletions