From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 2 Jan 2015 20:07:50 +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=d7e19bd882c23109853ac67f414024c816edc8b9;p=linux-beck.git

Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

Pull vhost cleanup and virtio bugfix
 "There's a single change here, fixing a vhost bug where vhost
  initialization fails due to used ring alignment check being too
  strict"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  vhost: relax used address alignment
  virtio_ring: document alignment requirements
---

d7e19bd882c23109853ac67f414024c816edc8b9