Merge tag 'socfpga_fix_for_v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Fri, 13 Nov 2020 12:18:36 +0000 (13:18 +0100)
committerArnd Bergmann <arnd@arndb.de>
Fri, 13 Nov 2020 12:18:49 +0000 (13:18 +0100)
commit53bbff2668801638566151c8d393484ba7997cca
tree9b7dfffdae862e86ffe0e396cb9efcf19f246e71
parente57523fa64d6166de6e70227a3d4395233015bc8
parentf126b6702e7354d6247a36f20b9172457af5c15a
Merge tag 'socfpga_fix_for_v5.10' of git://git./linux/kernel/git/dinguyen/linux into arm/fixes

arm64: dts: fix for v5.10
- Fix the qspi node to have the required "jedec,spi-nor"

Signed-off-by: Arnd Bergmann <arnd@arndb.de>