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

Commit 13a29d9a authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge branch 'v3.18/topic/android/aosp-fixes' into linux-linaro-lsk-v3.18-android 

* v3.18/topic/android/aosp-fixes:
  net/Kconfig: paranoid only for android
  android: configs: base: enable IPV6
parents ad689af6 66ff7c37
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