aboutsummaryrefslogtreecommitdiff
path: root/net/xfrm
diff options
context:
space:
mode:
authorLinus Torvalds2018-12-19 18:40:48 -0800
committerLinus Torvalds2018-12-19 18:40:48 -0800
commitab63e725b49c80f941446327d79ba5b68593bf5a (patch)
tree394bd0d901fcff6001ab77c6cf436915127698eb /net/xfrm
parent8c9dff1ebd721a3b19a002d1a901d4dc31b18ebb (diff)
parentc5c08bed843c2b2c048c16d1296d7631d7c1620e (diff)
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull virtio fix from Michael Tsirkin: "A last-minute fix for a test build" * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: virtio: fix test build after uio.h change
Diffstat (limited to 'net/xfrm')
0 files changed, 0 insertions, 0 deletions