diff --git a/[refs] b/[refs] index e1863fe21d94..b3915a21df90 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cbae48738f23d5409138700c5ccdfd6e4e0d6032 +refs/heads/master: 2426ec8fe78884272a12a0a0f38b008a6195f094 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 100198ea76b6..445537d46e7a 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -6600,6 +6600,16 @@ S: Maintained F: drivers/char/virtio_console.c F: include/linux/virtio_console.h +VIRTIO CORE, NET AND BLOCK DRIVERS +M: Rusty Russell +M: "Michael S. Tsirkin" +L: virtualization@lists.linux-foundation.org +S: Maintained +F: drivers/virtio/ +F: drivers/net/virtio_net.c +F: drivers/block/virtio_blk.c +F: include/linux/virtio_*.h + VIRTIO HOST (VHOST) M: "Michael S. Tsirkin" L: kvm@vger.kernel.org