diff options
| author | Oleksandr Suvorov <oleksandr.suvorov@toradex.com> | 2020-07-06 20:17:30 +0300 |
|---|---|---|
| committer | Oleksandr Suvorov <oleksandr.suvorov@toradex.com> | 2020-07-06 20:24:05 +0300 |
| commit | d6e1cff14875d6ce338c1f27afe0639ef0f97b79 (patch) | |
| tree | 2449859b19a9e58abb0414700621a86f234d91d6 /usr | |
| parent | 453fdfde79e13e27030a56c7ea787e98698b0dba (diff) | |
| parent | 0347fe7527d062e1762498cb5863bcd5bde0997b (diff) | |
Merge branch 'imx_4.14.98_2.3.0' into toradex_4.14-2.3.x-imx
Fix conflicts after merging changes from the latest NXP branch.
Conflicts:
arch/arm64/boot/dts/freescale/fsl-imx8qm-device.dtsi
drivers/pci/dwc/pci-imx6.c
Related-to: ELB-1306
Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
Diffstat (limited to 'usr')
0 files changed, 0 insertions, 0 deletions