summaryrefslogtreecommitdiff
path: root/timer.c
diff options
context:
space:
mode:
Diffstat (limited to 'timer.c')
0 files changed, 0 insertions, 0 deletions
.cgi/linux/net-next.git/diff/?h=nds-private-remove&id=a49e6f584e29785f9e5eb8dd31435746818dd5c4&id2=e9f7f17d53003ee46ccbaf057f7820bfb6e76b9d'>diff)parent79134d11d030b886106bf45a5638c1ccb1f0856c (diff)
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
-rw-r--r--MAINTAINERS2
-rw-r--r--drivers/vhost/vhost.c10
-rw-r--r--drivers/virtio/virtio_ring.c7
3 files changed, 5 insertions, 14 deletions
diff --git a/MAINTAINERS b/MAINTAINERS