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


Trivial merge