From: Linus Torvalds Date: Tue, 2 Jun 2015 01:49:45 +0000 (-0700) Subject: Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fec345baa52e01e05c8c05c04a358b4105445e23;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Merge tag 'for_linus' of git://git./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 --- fec345baa52e01e05c8c05c04a358b4105445e23