summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2018-01-31 16:23:58 +0100
committerJiri Kosina <jkosina@suse.cz>2018-01-31 16:23:58 +0100
commitc86aa0129c07c8c7f54dc47656de99ab0eb809b3 (patch)
tree541f5622269d2b0f0de2afcacf6e512ccbab3bf3 /net
parente56236b0b27fb7c0e044ba578713ea91ede0c237 (diff)
parent648d49329976edc9d0d73fc0c7a45f15df0b6659 (diff)
parent7ad81482cad67cbe1ec808490d1ddfc420c42008 (diff)
Merge branches 'for-4.16/upstream' and 'for-4.15/upstream-fixes' into for-linus
Pull assorted small fixes queued for merge window.