diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-15 15:55:49 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-15 15:55:49 -1000 |
| commit | 78ae255f7891d41fe4ed492f270fe663f4b261af (patch) | |
| tree | 0b0b6d46505e6397fdf9deaab0a92b1800c96d2d /MAINTAINERS | |
| parent | 90effdcd2b8a39927aace655c72088a62911e8e1 (diff) | |
| parent | 139ab4d4e68b8cf2a611b06c006a2195dc6bedf1 (diff) | |
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
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
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 7c326f155001..b697a03e307a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12148,6 +12148,7 @@ VIRTIO CORE, NET AND BLOCK DRIVERS M: "Michael S. Tsirkin" <mst@redhat.com> L: virtualization@lists.linux-foundation.org S: Maintained +F: Documentation/devicetree/bindings/virtio/ F: drivers/virtio/ F: tools/virtio/ F: drivers/net/virtio_net.c |