diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2017-06-17 17:59:52 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2017-06-17 17:59:52 +0200 |
| commit | d01107902d6fd5eb21a4136a343b531b63e563d6 (patch) | |
| tree | 197795441706bcc8d6e27ca324951745a21cf67c /drivers/net/wireless/at76c50x-usb.c | |
| parent | 3ca407c4f1edfcdf8cdba81bd82b1ab2e9b406a7 (diff) | |
| parent | 5c7513c4866175f5057fbe1d039e53e00a2dba53 (diff) | |
Merge remote-tracking branch 'fslc/4.1-2.0.x-imx' into toradex_4.1-2.0.x-imx-next
Conflicts:
arch/arm/boot/dts/imx7d.dtsi
arch/arm/mach-imx/busfreq-imx.c
arch/arm/mach-imx/imx_rpmsg.c
drivers/mmc/host/sdhci-esdhc-imx.c
Parts moved to:
arch/arm/boot/dts/imx7s.dtsi
Note: This also includes NXP's latest rel_imx_4.1.15_2.1.0_ga.
Diffstat (limited to 'drivers/net/wireless/at76c50x-usb.c')
0 files changed, 0 insertions, 0 deletions