From: Paolo Bonzini <pbonzini@redhat.com>
Date: Mon, 3 Nov 2014 11:41:34 +0000 (+0100)
Subject: Merge tag 'kvm-s390-20141103' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms39... 
X-Git-Tag: firefly_0821_release~176^2~2881^2~1
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=bc79a3179a1da387d730af81ce857d481915efdb;p=firefly-linux-kernel-4.4.55.git

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.
---

bc79a3179a1da387d730af81ce857d481915efdb