| commit | a26a830786c1b0864f554af76fdcf15aec2115ab | [log] [tgz] |
|---|---|---|
| author | Jon Medhurst <tixy@linaro.org> | Tue Aug 04 16:13:51 2015 +0100 |
| committer | Jon Medhurst <tixy@linaro.org> | Tue Aug 04 16:13:51 2015 +0100 |
| tree | ca406c7b7b8cf2b7f75d9d3b60e92d2a5beeee52 | |
| parent | eac86f4dfd7d5705101f93c0e19ba7c799b03bc9 [diff] | |
| parent | 3a2859d44938473bca16ab5b09e4db2d5392fcff [diff] |
Merge branch 'lsk-3.10-armlt-scpi-thermal' into integration-lsk-3.10-juno-android Conflicts: arch/arm64/boot/dts/juno.dts linaro/configs/vexpress64.conf