tree a450a77b8134371fd25d8e27587460732c098a90
parent ab4e1589f072c7a5d1238c7f0d289c163c7736b2
parent bf72d89f0a8fb27a6bfde1a689690fd577227762
author Anthony Liguori <aliguori@us.ibm.com> 1373914961 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1373914961 -0500

Merge remote-tracking branch 'cohuck/virtio-ccw-upstr' into staging

# By Dominik Dingel
# Via Cornelia Huck
* cohuck/virtio-ccw-upstr:
  virtio-ccw: Enable x-data-plane for virtio-ccw-blk

Message-id: 1373903207-27085-1-git-send-email-cornelia.huck@de.ibm.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>