diff options
| author | Jon Medhurst <tixy@linaro.org> | 2015-05-15 15:25:34 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2015-05-15 15:25:34 +0100 |
| commit | d48a114b7731434919d75a77b1444d1b7875d244 (patch) | |
| tree | ff133d0657efa7fea122e4f6854614bba12d4b84 /include/linux/pci_ids.h | |
| parent | 0e1d45ab249bc0ee76e723baae36e8c651102eca (diff) | |
| parent | a4eb38b4f1c65f84f8df78632c7e29763a176f91 (diff) | |
Merge branch 'tracking-armlt-juno-cpufreq' into integration-linaro-vexpress64
Conflicts:
arch/arm64/boot/dts/arm/juno.dts
Diffstat (limited to 'include/linux/pci_ids.h')
0 files changed, 0 insertions, 0 deletions