Merge remote-tracking branch 'origin/v3.10/topic/zram' into linux-linaro-lsk