Merge tag 'v5.11-berlin-dts64' of git://git.kernel.org/pub/scm/linux/kernel/git/jszha...
authorArnd Bergmann <arnd@arndb.de>
Fri, 8 Jan 2021 15:58:49 +0000 (16:58 +0100)
committerArnd Bergmann <arnd@arndb.de>
Fri, 8 Jan 2021 15:58:50 +0000 (16:58 +0100)
commit35d09d1ad45160101733f116d1283907d8a28ee2
tree1db1adb33695e8eb1751f3c6a9aa7a551859ad69
parente71ba9452f0b5b2e8dc8aa5445198cd9214a6a62
parentec13e5027261c7a09e70b309050a858076bae5a0
Merge tag 'v5.11-berlin-dts64' of git://git./linux/kernel/git/jszhang/linux-berlin into arm/dt

v5.11-berlin-dts64

* tag 'v5.11-berlin-dts64' of git://git.kernel.org/pub/scm/linux/kernel/git/jszhang/linux-berlin:
  arm64: dts: synaptics: Use generic "ngpios" rather than "snps,nr-gpios"

Link: https://lore.kernel.org/r/20201211100235.2b0b795b@xhacker.debian
Signed-off-by: Arnd Bergmann <arnd@arndb.de>