Merge branch 'master' into for-next
[pandora-kernel.git] / drivers / virtio / virtio_pci.c
Simple merge