]> asedeno.scripts.mit.edu Git - linux.git/commit
Merge tag 'sunxi-dt64-for-4.15-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Tue, 7 Nov 2017 15:20:25 +0000 (16:20 +0100)
committerArnd Bergmann <arnd@arndb.de>
Tue, 7 Nov 2017 15:20:25 +0000 (16:20 +0100)
commitea7cdc066e479cb7d8a3551d206c7aa9c7f8b33a
tree27a31beb74235a9b6b45996b9e1633242414d8db
parent2cdc614b07bc284115f136c20a898a86e632cbf7
parent16416084e06e1ebff51a9e7721a8cc4ccc186f28
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
arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts