diff options
| author | Jon Medhurst <tixy@linaro.org> | 2015-04-22 18:17:55 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2015-04-22 18:17:55 +0100 |
| commit | 18da101d4aa62e3e7f8caa0cac21fe612aeb090d (patch) | |
| tree | bb0d280e1966a5c3d00947f35c15dcfb7900405d /drivers | |
| parent | cc62188f7fe6d625b7445904e97f47e9733fecfe (diff) | |
| parent | 0af312b33f5f7622efa08ac72fa783841947c4a7 (diff) | |
Merge branch 'lsk-3.10-armlt-asoc-new' into integration-lsk-3.10-juno-android-newlsk-3.10-armlt-juno-20150422
Conflicts:
arch/arm64/boot/dts/juno.dts
linaro/configs/vexpress64.conf
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions