diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-10-02 23:35:53 +0300 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-10-02 23:35:53 +0300 |
| commit | 8609d8d8da08156fd0bd41bf4122a1b8345feba6 (patch) | |
| tree | 968a4be3182f0b678b3a095288f6c36cd6bec702 /Kconfig | |
| parent | c427dfa47342d22eb1a42c153b6fe420131c45a0 (diff) | |
| parent | 52bddd7cb59adbc9ce56ebd03ad63936cf7cd1e5 (diff) | |
Automatically merging tracking-integration-linux-qcomlt into merge-linux-linaroll-20151002.0
Conflicting files:
drivers/firmware/Makefile
drivers/firmware/qcom_scm-64.c
drivers/mmc/core/Kconfig
Diffstat (limited to 'Kconfig')
0 files changed, 0 insertions, 0 deletions