diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-07 18:49:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-07 18:49:20 -0700 |
| commit | f5284e7635787224dda1a2bf82a4c56b1c75671f (patch) | |
| tree | 885730ccc2e890368e9012869e54538182fda8f7 /MAINTAINERS | |
| parent | 3eac4abaa69949af0e2f64e5c55ee8a22bbdd3e7 (diff) | |
| parent | 320718ee074acce5ffced6506cb51af1388942aa (diff) | |
| download | kernel_samsung_smdk4412-f5284e7635787224dda1a2bf82a4c56b1c75671f.zip kernel_samsung_smdk4412-f5284e7635787224dda1a2bf82a4c56b1c75671f.tar.gz kernel_samsung_smdk4412-f5284e7635787224dda1a2bf82a4c56b1c75671f.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
hvc_console: Fix race between hvc_close and hvc_remove
virtio: disable multiport console support.
virtio: console makes incorrect assumption about virtio API
virtio: console: Fix early_put_chars usage
MAINTAINERS: Put the virtio-console entry in correct alphabetical order
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 3d29fa3..7a9ccda 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2474,12 +2474,6 @@ 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 - iSCSI BOOT FIRMWARE TABLE (iBFT) DRIVER M: Peter Jones <pjones@redhat.com> M: Konrad Rzeszutek Wilk <konrad@kernel.org> @@ -5971,6 +5965,13 @@ S: Maintained F: Documentation/filesystems/vfat.txt F: fs/fat/ +VIRTIO CONSOLE DRIVER +M: Amit Shah <amit.shah@redhat.com> +L: virtualization@lists.linux-foundation.org +S: Maintained +F: drivers/char/virtio_console.c +F: include/linux/virtio_console.h + VIRTIO HOST (VHOST) M: "Michael S. Tsirkin" <mst@redhat.com> L: kvm@vger.kernel.org |