Merge tag 'amlogic-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman...
authorArnd Bergmann <arnd@arndb.de>
Thu, 28 Jan 2021 12:57:11 +0000 (13:57 +0100)
committerArnd Bergmann <arnd@arndb.de>
Thu, 28 Jan 2021 12:57:11 +0000 (13:57 +0100)
commitfd28a52a4fce69b3abc2d4f1aca5bccdb3dffe2c
tree8a47fe3a2cdb09fe849eab947b07dea2059021bf
parentf2d514b4f428265e418e8fb46adebeb6c0717131
parent19f6fe976a61f9afc289b062b7ef67f99b72e7b9
Merge tag 'amlogic-fixes-2' of git://git./linux/kernel/git/khilman/linux-amlogic into arm/fixes

arm64: dts: amlogic fixes for v5.11-rc (round 2)
- fix ethernet resets

* tag 'amlogic-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  Revert "arm64: dts: amlogic: add missing ethernet reset ID"

Link: https://lore.kernel.org/r/7ho8hai7e6.fsf@baylibre.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>