Merge branches 'ib-mfd-hwmon-regulator-5.18', 'ib-mfd-iio-5.18', 'ib-mfd-led-power...
authorLee Jones <lee.jones@linaro.org>
Tue, 8 Mar 2022 09:42:41 +0000 (09:42 +0000)
committerLee Jones <lee.jones@linaro.org>
Tue, 8 Mar 2022 09:42:41 +0000 (09:42 +0000)
1  2  3  4  5  6 
MAINTAINERS
drivers/mfd/Kconfig

diff --cc MAINTAINERS
@@@@@@@ -11710,6 -11710,6 -11710,7 -11710,6 -11717,6 -11710,7 +11717,8 @@@@@@@ M:       Krzysztof Kozlowski <krzysztof.kozlo
      M:        Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
      L:        linux-pm@vger.kernel.org
      S:        Supported
+++++ F:        Documentation/devicetree/bindings/power/supply/maxim,max14577.yaml
++ +++F:        Documentation/devicetree/bindings/power/supply/maxim,max77693.yaml
      F:        drivers/power/supply/max14577_charger.c
      F:        drivers/power/supply/max77693_charger.c
      
@@@@@@@ -11719,10 -11719,10 -11720,10 -11719,10 -11726,10 -11720,12 +11728,13 @@@@@@@ M:        Krzysztof Kozlowski <krzysztof.kozlo
      M:        Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
      L:        linux-kernel@vger.kernel.org
      S:        Supported
+++++ F:        Documentation/devicetree/bindings/*/maxim,max14577.yaml
      F:        Documentation/devicetree/bindings/*/maxim,max77686.yaml
++ +++F:        Documentation/devicetree/bindings/*/maxim,max77693.yaml
+++++ F:        Documentation/devicetree/bindings/*/maxim,max77843.yaml
      F:        Documentation/devicetree/bindings/clock/maxim,max77686.txt
----- F:        Documentation/devicetree/bindings/mfd/max14577.txt
  +   F:        Documentation/devicetree/bindings/mfd/max77693.txt
+++++ F:        drivers/*/*max77843.c
      F:        drivers/*/max14577*.c
      F:        drivers/*/max77686*.c
      F:        drivers/*/max77693*.c
Simple merge