summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
Diffstat (limited to 'sound')
0 files changed, 0 insertions, 0 deletions
46818dd5c4 (patch) treeceb19acc16ea98335e44f5db95c7e23102ad9f64 /drivers parente9f7f17d53003ee46ccbaf057f7820bfb6e76b9d (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 (limited to 'drivers')
-rw-r--r--drivers/vhost/vhost.c10
-rw-r--r--drivers/virtio/virtio_ring.c7
2 files changed, 4 insertions, 13 deletions
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c