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

* v3.18/topic/configs:
  configs: linaro-base: enable ZRAM features

linaro/configs/linaro-base.conf

+6 −0

Original line number	Diff line number	Diff line
		@@ -79,3 +79,9 @@ CONFIG_THUMB2_KERNEL=y
		CONFIG_TIMER_STATS=y
		CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
		CONFIG_XFRM_USER=y

		# enable ZRAM features
		CONFIG_ZPOOL=y
		CONFIG_ZSMALLOC=y
		CONFIG_ZRAM=y
		CONFIG_ZRAM_LZ4_COMPRESS=y