diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-11-07 16:20:25 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-11-07 16:20:25 +0100 |
| commit | ea7cdc066e479cb7d8a3551d206c7aa9c7f8b33a (patch) | |
| tree | 27a31beb74235a9b6b45996b9e1633242414d8db /arch/arm/mach-sti/platsmp.c | |
| parent | 2cdc614b07bc284115f136c20a898a86e632cbf7 (diff) | |
| parent | 16416084e06e1ebff51a9e7721a8cc4ccc186f28 (diff) | |
| download | linux-ea7cdc066e479cb7d8a3551d206c7aa9c7f8b33a.tar.gz linux-ea7cdc066e479cb7d8a3551d206c7aa9c7f8b33a.tar.bz2 linux-ea7cdc066e479cb7d8a3551d206c7aa9c7f8b33a.zip | |
Merge tag 'sunxi-dt64-for-4.15-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/dt
Pull "Allwinner arm64 changes, take 2" from Maxime Ripard:
Reintroduction of the EMAC bindings that were reverted in 4.13.
* tag 'sunxi-dt64-for-4.15-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
arm64: dts: allwinner: add snps,dwmac-mdio compatible to emac/mdio
arm64: dts: allwinner: A64: Restore EMAC changes
Diffstat (limited to 'arch/arm/mach-sti/platsmp.c')
0 files changed, 0 insertions, 0 deletions