projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e989cc5 bb99128)
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 May 2016 16:46:45 +0000 (09:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 May 2016 16:46:45 +0000 (09:46 -0700)
commitecaba7185894778c24895356d117a7f92e3c92de
tree03567db9d31a453f4262c923c9717e4d394e6881tree | snapshot
parente989cc564691901d42e957059592fe3e7b6893fccommit | diff
parentbb991288728e6a47a6f0fac6a4e9dfaeecc27956commit | diff
Merge tag 'for_linus' of git://git./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
John Crispins staging tree