From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 3 Feb 2017 23:43:30 +0000 (-0800)
Subject: Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a49e6f584e29785f9e5eb8dd31435746818dd5c4;p=linux-beck.git

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"
---

a49e6f584e29785f9e5eb8dd31435746818dd5c4