tag | 176cd02ef7f240987947a7cdb0406c41be5e17f5 | |
---|---|---|
tagger | Kevin Hilman <khilman@linaro.org> | Tue Jun 23 11:39:47 2015 -0700 |
object | 230304f53c54520b3b28b9e420719fe328984c17 |
LSK 15.06 v3.18
commit | 230304f53c54520b3b28b9e420719fe328984c17 | [log] [tgz] |
---|---|---|
author | Kevin Hilman <khilman@linaro.org> | Mon Jun 22 09:40:12 2015 -0700 |
committer | Kevin Hilman <khilman@linaro.org> | Mon Jun 22 09:40:12 2015 -0700 |
tree | 35a3396772baf5e0c0c28c43fa46bdd72c7192dd | |
parent | 9a004a75a3305fbd3c253f38cd0788164c4fbd56 [diff] | |
parent | a0b6bc035e9b20c56a270bb80b3237a4997182b3 [diff] |
Merge branch 'v3.18/topic/configs' into linux-linaro-lsk-v3.18 * 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"