diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-24 09:46:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-24 09:46:45 -0700 |
| commit | ecaba7185894778c24895356d117a7f92e3c92de (patch) | |
| tree | 03567db9d31a453f4262c923c9717e4d394e6881 /drivers/staging/media | |
| parent | e989cc564691901d42e957059592fe3e7b6893fc (diff) | |
| parent | bb991288728e6a47a6f0fac6a4e9dfaeecc27956 (diff) | |
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull virtio updates from Michael Tsirkin:
"Looks like a quiet cycle for virtio. There's a new inorder option for
the ringtest tool, and a bugfix for balloon for ppc platforms when
using virtio 1 mode"
* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
ringtest: pass buf != NULL
virtio_balloon: fix PFN format for virtio-1
virtio: add inorder option
Diffstat (limited to 'drivers/staging/media')
0 files changed, 0 insertions, 0 deletions