Merge tag 'soc-fixes-5.14-4' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 27 Aug 2021 22:59:00 +0000 (15:59 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 27 Aug 2021 22:59:00 +0000 (15:59 -0700)
commit6f18b82b41147ee15b0b5bf7c9ae0464dda287f9
tree7f5db6c45e50b1056cf0f7e158813105c424a9a9
parent8f9d0349841a2871624bb1e85309e03e9867c16e
parent6c35ca06974105d929f25f487c6ae7a47fffa128
Merge tag 'soc-fixes-5.14-4' of git://git./linux/kernel/git/soc/soc

Pull ARM SoC fixes from Arnd Bergmann:
 "Just two trivial fixes from the reset driver tree, nothing else came
  up since the last soc fixes"

* tag 'soc-fixes-5.14-4' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  reset: reset-zynqmp: Fixed the argument data type
  reset: RESET_MCHP_SPARX5 should depend on ARCH_SPARX5