]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commit
Merge tag 'reset-fixes-for-v5.6' of git://git.pengutronix.de/git/pza/linux into arm...
authorOlof Johansson <olof@lixom.net>
Mon, 24 Feb 2020 17:53:00 +0000 (09:53 -0800)
committerOlof Johansson <olof@lixom.net>
Mon, 24 Feb 2020 17:53:01 +0000 (09:53 -0800)
commit0e26cbdfb32ed5bb65ca4640716c62129865b59c
treee492d3799844eca49ee33c058fe3eec8f11eff8b
parent3bf3c9744694803bd2d6f0ee70a6369b980530fd
parentb460e0a9e2404450a0cc4c5e6476483d6cda1b26
Merge tag 'reset-fixes-for-v5.6' of git://git.pengutronix.de/git/pza/linux into arm/fixes

Reset controller fixes for v5.6

Fix the intel,rcu-gw binding schema for the intel,global-reset
property, fix whitespace in the MAINTAINERS keyword entry, and
add missing CONFIG_HAS_IOMEM dependency to CONFIG_RESET_INTEL_GW
and CONFIG_RESET_BRCMSTB_RESCAL.

* tag 'reset-fixes-for-v5.6' of git://git.pengutronix.de/git/pza/linux:
  reset: intel: add unspecified HAS_IOMEM dependency
  reset: brcmstb-rescal: add unspecified HAS_IOMEM dependency
  MAINTAINERS: fix style in RESET CONTROLLER FRAMEWORK
  dt-bindings: reset: intel,rcu-gw: Fix intel,global-reset schema

Link: https://lore.kernel.org/r/e6eaa409883cbae8d1e818b732b98c3362635712.camel@pengutronix.de
Signed-off-by: Olof Johansson <olof@lixom.net>