diff options
author | Kevin Hilman <khilman@linaro.org> | 2015-06-02 09:03:29 -0700 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2015-06-02 09:03:29 -0700 |
commit | 361e3f0276d666faa6a785f610ffc8b7c541d478 (patch) | |
tree | 3fa5b452d36f27ca048105e99289ed00b307c410 /fs | |
parent | 2a16dc89be013e50283ec1461e5c1cc8bc24c474 (diff) | |
parent | e0ddb0d39bf8e71cf36aa3a0e1b7e94c33a1f22b (diff) |
Merge branch 'v3.14/topic/configs' into linux-linaro-lsk-v3.14
* v3.14/topic/configs:
configs: linaro-base: enable ZRAM features
configs: Enable coresight by default
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions