From: Anthony Liguori Date: Tue, 25 Jun 2013 19:14:05 +0000 (-0500) Subject: Merge remote-tracking branch 'cohuck/virtio-ccw-upstr' into staging X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=9e49c8c58c7aa0eb93e4c83314a07b5c7f6339fe;p=people%2Fpauldu%2Fqemu.git Merge remote-tracking branch 'cohuck/virtio-ccw-upstr' into staging # By Cornelia Huck (2) and Christian Borntraeger (1) # Via Cornelia Huck * cohuck/virtio-ccw-upstr: virtio-ccw: Wire up guest and host notifies. virtio-ccw: Wire up ioeventfd. s390/virtio-ccw: Fix virtio reset Message-id: 1372177538-9812-1-git-send-email-cornelia.huck@de.ibm.com Signed-off-by: Anthony Liguori --- 9e49c8c58c7aa0eb93e4c83314a07b5c7f6339fe