Merge branch 'v3.10/topic/configs' into linux-linaro-lsk-v3.10
authorKevin Hilman <khilman@linaro.org>
Tue, 2 Jun 2015 15:47:21 +0000 (08:47 -0700)
committerKevin Hilman <khilman@linaro.org>
Tue, 2 Jun 2015 15:47:21 +0000 (08:47 -0700)
* v3.10/topic/configs:
  configs: linaro-base: enable ZRAM features
  configs: Enable coresight by default

1  2 
linaro/configs/linaro-base.conf

Simple merge