summaryrefslogtreecommitdiff
path: root/mac80211.h
diff options
context:
space:
mode:
Diffstat (limited to 'mac80211.h')
0 files changed, 0 insertions, 0 deletions
h=nds-private-remove&id=ecaba7185894778c24895356d117a7f92e3c92de&id2=e989cc564691901d42e957059592fe3e7b6893fc'>diff)parentbb991288728e6a47a6f0fac6a4e9dfaeecc27956 (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