diff options
| author | Jon Medhurst <tixy@linaro.org> | 2015-05-13 09:26:38 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2015-05-13 09:26:38 +0100 |
| commit | 3b420f0573ccf1266bc2d4ecdfe628896cb465de (patch) | |
| tree | cd842a9fb39768f5ccdb59887ccce746881b392c /arch/arm64/include/asm/pci.h | |
| parent | e6dc548621741f3e502a0880d828384569cea556 (diff) | |
| parent | a4eb38b4f1c65f84f8df78632c7e29763a176f91 (diff) | |
Merge branch 'tracking-armlt-juno-cpufreq' into integration-linaro-vexpress64tracking-integration-linaro-vexpress-ll-20150514.0
Conflicts:
arch/arm64/boot/dts/arm/juno.dts
Diffstat (limited to 'arch/arm64/include/asm/pci.h')
0 files changed, 0 insertions, 0 deletions