diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2013-07-10 14:50:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2013-07-10 14:50:58 -0700 |
| commit | 5f129721713e099a04c6024015f97faa58562ab1 (patch) | |
| tree | c5a498f217da044eb5ce870bedc95c4bf82cf185 /MAINTAINERS | |
| parent | Merge tag 'vfio-v3.11' of git://github.com/awilliam/linux-vfio (diff) | |
| parent | MAINTAINERS: add tools/virtio/ under virtio (diff) | |
| download | linux-5f129721713e099a04c6024015f97faa58562ab1.tar.gz linux-5f129721713e099a04c6024015f97faa58562ab1.tar.bz2 linux-5f129721713e099a04c6024015f97faa58562ab1.zip | |
Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
Pull virtio updates from Rusty Russell:
"No real surprises"
* tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
MAINTAINERS: add tools/virtio/ under virtio
tools/virtio: move module license stub to module.h
virtio: include asm/barrier explicitly
virtio: VIRTIO_F_ANY_LAYOUT feature
lguest: fix example launcher compilation for broken glibc headers.
virtio-net: fix the race between channels setting and refill
tools/lguest: real barriers.
tools/lguest: fix missing rmb().
virtio_balloon: leak_balloon(): only tell host if we got pages deflated
virtio-pci: fix leaks of msix_affinity_masks
Fix comment typo "CONFIG_PAE"
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index af4c3be44ac3..e51d01836b54 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8890,6 +8890,7 @@ M: "Michael S. Tsirkin" <mst@redhat.com> L: virtualization@lists.linux-foundation.org S: Maintained F: drivers/virtio/ +F: tools/virtio/ F: drivers/net/virtio_net.c F: drivers/block/virtio_blk.c F: include/linux/virtio_*.h |