From: Kevin Hilman Date: Tue, 2 Jun 2015 15:47:21 +0000 (-0700) Subject: Merge branch 'v3.10/topic/configs' into linux-linaro-lsk-v3.10 X-Git-Tag: firefly_0821_release~3680^2~5^2~2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3c81a385064bd31a9628acee031cfe1ca637dc74;p=firefly-linux-kernel-4.4.55.git Merge branch 'v3.10/topic/configs' into linux-linaro-lsk-v3.10 * v3.10/topic/configs: configs: linaro-base: enable ZRAM features configs: Enable coresight by default --- 3c81a385064bd31a9628acee031cfe1ca637dc74