Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge 4.4.205 into android-4.4-p 



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

Change-Id: Idf9798de380712271babf65554ecc4251ea744f0
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 583bdda5 2810f15b
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment