Merge tag 'kvm-s390-20141103' of...

Merge tag 'kvm-s390-20141103' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-master

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

drivers/s390/kvm/virtio_ccw.c

@@ -888,7 +888,6 @@ static void virtio_ccw_int_handler(struct ccw_device *cdev,
 	struct virtio_ccw_device *vcdev = dev_get_drvdata(&cdev->dev);
 	int i;
 	struct virtqueue *vq;
-	struct virtio_driver *drv;
 
 	if (!vcdev)
 		return;