diff options
author | Olof Johansson <olof@lixom.net> | 2020-02-24 09:53:00 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2020-02-24 09:53:01 -0800 |
commit | 0e26cbdfb32ed5bb65ca4640716c62129865b59c (patch) | |
tree | e492d3799844eca49ee33c058fe3eec8f11eff8b /net/ethtool | |
parent | 3bf3c9744694803bd2d6f0ee70a6369b980530fd (diff) | |
parent | b460e0a9e2404450a0cc4c5e6476483d6cda1b26 (diff) |
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>
Diffstat (limited to 'net/ethtool')
0 files changed, 0 insertions, 0 deletions