Merge tag 'dt-fixes-for-palmer-5.19-rc3' of ssh://gitolite.kernel.org/pub/scm/linux...
authorPalmer Dabbelt <palmer@rivosinc.com>
Thu, 16 Jun 2022 22:13:10 +0000 (15:13 -0700)
committerPalmer Dabbelt <palmer@rivosinc.com>
Thu, 16 Jun 2022 22:13:10 +0000 (15:13 -0700)
Microchip RISC-V devicetree fixes for 5.19-rc3

A single fix for mpfs.dtsi:
- The sifive pdma entry fell through the cracks between versions of my
  dt patches & I gave Zong the wrong conflict resolution, so it is
  added back.

* tag 'dt-fixes-for-palmer-5.19-rc3' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/conor/linux:
  riscv: dts: microchip: re-add pdma to mpfs device tree


Trivial merge