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

Commit 230304f5 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge branch 'v3.18/topic/configs' into linux-linaro-lsk-v3.18 

* v3.18/topic/configs:
  configs: linaro-base: enable ZRAM features
  Revert "linaro/configs: remove options already present in base defconfig"
  Revert "configs: linaro-base: enable ZRAM features"
parents 9a004a75 a0b6bc03
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