Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Jun 2016 01:55:49 +0000 (15:55 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Jun 2016 01:55:49 +0000 (15:55 -1000)
Pull virtio docs and tests from Michael Tsirkin:
 "This merely has some documentation and a new test, seems safe to
  merge"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  tools/virtio: add noring tool
  tools/virtio/ringtest: fix run-on-all.sh to work without /dev/cpu
  tools/virtio/ringtest: add usage example to README
  MAINTAINERS: Add file patterns for virtio device tree bindings

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge