diff options
| author | Sumit Semwal <sumit.semwal@linaro.org> | 2017-09-15 18:14:44 -0700 |
|---|---|---|
| committer | Sumit Semwal <sumit.semwal@linaro.org> | 2017-09-15 18:14:44 -0700 |
| commit | 357fdc8959dc79696d9c43c2a3f7a93e3a503d87 (patch) | |
| tree | ee11e23191b602d459c2ddd42ad8688435907fc7 /arch/arm64/boot/dts/hisilicon/hi6220.dtsi | |
| parent | c6838a60d7c26d484dee76609ab0d528ff90a805 (diff) | |
| parent | b52c9082f2eb3a6f7fbbc86fad3eaa2a1725da66 (diff) | |
Merge remote-tracking branch 'stable/linux-4.4.y' into lts-4.4.y-hikey
Try to fix adv7511.c collision
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Sumit Semwal <sumit.semwal@linaro.org>
Diffstat (limited to 'arch/arm64/boot/dts/hisilicon/hi6220.dtsi')
0 files changed, 0 insertions, 0 deletions