LSK 15.06 v3.18
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"