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

Commit bdcf7d8d authored by Alex Shi's avatar Alex Shi
Browse files

Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android 

Conflicts:
	keep low scan freq in android in net/wireless/scan.c
parents a8575ee8 3ba1692e
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