Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus

[safe/jmp/linux-2.6] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 2533fc4..317ed38 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2393,6 +2393,12 @@ L:       linuxppc-dev@ozlabs.org
 S:     Odd Fixes
 F:     drivers/char/hvc_*
 
+VIRTIO CONSOLE DRIVER
+M:     Amit Shah <amit.shah@redhat.com>
+L:     virtualization@lists.linux-foundation.org
+S:     Maintained
+F:     drivers/char/virtio_console.c
+
 GSPCA FINEPIX SUBDRIVER
 M:     Frank Zago <frank@zago.net>
 L:     linux-media@vger.kernel.org