diff options
author | Kevin Hilman <khilman@linaro.org> | 2015-06-22 09:40:12 -0700 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2015-06-22 09:40:12 -0700 |
commit | 230304f53c54520b3b28b9e420719fe328984c17 (patch) | |
tree | 35a3396772baf5e0c0c28c43fa46bdd72c7192dd /drivers | |
parent | 9a004a75a3305fbd3c253f38cd0788164c4fbd56 (diff) | |
parent | a0b6bc035e9b20c56a270bb80b3237a4997182b3 (diff) |
Merge branch 'v3.18/topic/configs' into linux-linaro-lsk-v3.18lsk-v3.18-15.06
* v3.18/topic/configs:
configs: linaro-base: enable ZRAM features
Revert "linaro/configs: remove options already present in base defconfig"
Revert "configs: linaro-base: enable ZRAM features"
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions