diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-01 18:49:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-01 18:49:45 -0700 |
| commit | fec345baa52e01e05c8c05c04a358b4105445e23 (patch) | |
| tree | effeddf006b6d68b4fd69a93b212910bad21c1ed /fs/jffs2 | |
| 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
Diffstat (limited to 'fs/jffs2')
0 files changed, 0 insertions, 0 deletions