Commit a36b5017 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.9.205 into android-4.9-q 



Changes in 4.9.205
	Revert "sock: Reset dst when changing sk_mark via setsockopt"
	Linux 4.9.205

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 72e85987 6620daa7
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment