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)
commit3c81a385064bd31a9628acee031cfe1ca637dc74
tree8fc344f9528acfcda62b3719416d2930af0cbc52
parent811b2126cde688e651d69287f82323c57a16cd30
parent0532c0990157877779fb61c8f5365af967913479
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
linaro/configs/linaro-base.conf