Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 2 Jan 2015 20:07:50 +0000 (12:07 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 2 Jan 2015 20:07:50 +0000 (12:07 -0800)
commitd7e19bd882c23109853ac67f414024c816edc8b9
tree9a302460f9aaa477d8203bd681261e1c1960aa4a
parent5e0f872c7d7e371fbdf09e864eddd24bddfda8fe
parent5d9a07b0de512b77bf28d2401e5fe3351f00a240
Merge tag 'for_linus' of git://git./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