Merge tag 'kvm-s390-20141103' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms39...
authorPaolo Bonzini <pbonzini@redhat.com>
Mon, 3 Nov 2014 11:41:34 +0000 (12:41 +0100)
committerPaolo Bonzini <pbonzini@redhat.com>
Mon, 3 Nov 2014 11:41:34 +0000 (12:41 +0100)
commitbc79a3179a1da387d730af81ce857d481915efdb
tree614ab630f05af73a86460ce128d32f31d991c186
parent0df1f2487d2f0d04703f142813d53615d62a1da4
parentf7ceb0dfec43d2d4e2373d02968f8fb58c6858f7
Merge tag 'kvm-s390-20141103' of git://git./linux/kernel/git/kvms390/linux into kvm-master

Fix a build warning in virtio-ccw introduced during the merge window.