| commit | fec345baa52e01e05c8c05c04a358b4105445e23 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 01 18:49:45 2015 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 01 18:49:45 2015 -0700 |
| tree | effeddf006b6d68b4fd69a93b212910bad21c1ed | |
| parent | c65b99f046843d2455aa231747b5a07a999a9f3d [diff] | |
| parent | 8a7b19d8b542b87bccc3eaaf81dcc90a5ca48aea [diff] |
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost Pull virtio fix from Michael Tsirkin: "Last-minute virtio fix for 4.1 This tweaks an exported user-space header to fix build breakage for userspace using it" * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: include/uapi/linux/virtio_balloon.h: include linux/virtio_types.h