| commit | 1f8fdf83fe376cc83e96e942689a6cfac01e9634 | [log] [tgz] |
|---|---|---|
| author | Alex Shi <alex.shi@linaro.org> | Tue May 12 14:55:30 2015 +0800 |
| committer | Alex Shi <alex.shi@linaro.org> | Tue May 12 14:55:30 2015 +0800 |
| tree | 5bd0c30cb23791f2806c85631fe45079e6917b9b | |
| parent | 8134585f1c33565ea5e752a7ba9323ed3e0921f3 [diff] | |
| parent | 043787104c5b1386a96c317f2e82ecff257dd9c5 [diff] |
Merge remote-tracking branch 'origin/v3.10/topic/zram' into linux-linaro-lsk Conflicts: mm/Kconfig mm/Makefile