summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-02-03 15:43:30 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2017-02-03 15:43:30 -0800
commita49e6f584e29785f9e5eb8dd31435746818dd5c4 (patch)
treeceb19acc16ea98335e44f5db95c7e23102ad9f64 /MAINTAINERS
parente9f7f17d53003ee46ccbaf057f7820bfb6e76b9d (diff)
parent79134d11d030b886106bf45a5638c1ccb1f0856c (diff)
downloadlinux-a49e6f584e29785f9e5eb8dd31435746818dd5c4.tar.bz2
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull virtio/vhost fixes from Michael S. Tsirkin: "Last minute fixes: - ARM DMA fix revert - vhost endian-ness fix - MAINTAINERS: email address change for Amit" * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: MAINTAINERS: update email address for Amit Shah vhost: fix initialization for vq->is_le Revert "vring: Force use of DMA API for ARM-based systems with legacy devices"
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 3960e7faaa99..187b9615e31a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -13065,7 +13065,7 @@ F: drivers/input/serio/userio.c
F: include/uapi/linux/userio.h
VIRTIO CONSOLE DRIVER
-M: Amit Shah <amit.shah@redhat.com>
+M: Amit Shah <amit@kernel.org>
L: virtualization@lists.linux-foundation.org
S: Maintained
F: drivers/char/virtio_console.c