diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-11-16 10:57:25 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-11-16 10:57:25 +0800 |
| commit | 29ed9e09b5173c3bbc9999c1ecebd9823c09857c (patch) | |
| tree | 7a2fd309af6abf1a3c610e28b658e7ecfd630189 /COPYING | |
| parent | 82c795655f6297b9efdcee2643ff937e1849ad83 (diff) | |
| parent | 9b42b559544c7ad3d246b6ad4c1125a74d02136a (diff) | |
Merge remote-tracking branch 'origin/v3.18/topic/pcie/master' into linux-linaro-lsk-v3.18
Conflicts solution:
/* Using the latest version dts', that is except the serial
* port definition in juno.dts, others keep the pcie/master
* version.
*/
arch/arm64/boot/dts/arm/Makefile
arch/arm64/boot/dts/arm/juno-clocks.dtsi
arch/arm64/boot/dts/arm/juno.dts
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions