diff --git a/[refs] b/[refs] index 813066d7e590..409060dbe02c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d6933561924d8022f5d986ce7c511a2646eeadce +refs/heads/master: c610028611479e6b9d8b2f1a6628e9417ef4114f diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index c95f727236e1..d0b374094008 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2393,6 +2393,12 @@ L: linuxppc-dev@ozlabs.org S: Odd Fixes F: drivers/char/hvc_* +VIRTIO CONSOLE DRIVER +M: Amit Shah +L: virtualization@lists.linux-foundation.org +S: Maintained +F: drivers/char/virtio_console.c + GSPCA FINEPIX SUBDRIVER M: Frank Zago L: linux-media@vger.kernel.org