Merge branch 'quilt/rr'

diff --cc drivers/net/virtio_net.c
Simple merge

diff --cc drivers/virtio/virtio_mmio.c
Simple merge

diff --cc drivers/virtio/virtio_pci.c
Simple merge

diff --cc include/linux/virtio_config.h
Simple merge