diff options
author | Mark Brown <broonie@kernel.org> | 2017-07-03 16:52:14 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-07-03 16:52:14 +0100 |
commit | 85fd19e432b5ed5357d54f1048a088d9eb5aae94 (patch) | |
tree | 91eb677df4d1d849dac2f52862ac1e570e40dc48 /MAINTAINERS | |
parent | 9ef6d2e0fac8fc9d899a9e07eda555792757b854 (diff) | |
parent | 64f7d692c5bdfbf0eb6efe4eacc597ff44d0e421 (diff) | |
download | linux-85fd19e432b5ed5357d54f1048a088d9eb5aae94.tar.bz2 |
Merge remote-tracking branch 'regulator/fix/max77802' into regulator-linus
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 767e9d202adf..fa5f7ba8b0bb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8060,11 +8060,11 @@ S: Supported F: drivers/power/supply/max14577_charger.c F: drivers/power/supply/max77693_charger.c -MAXIM MAX77802 MULTIFUNCTION PMIC DEVICE DRIVERS -M: Javier Martinez Canillas <javier@osg.samsung.com> +MAXIM MAX77802 PMIC REGULATOR DEVICE DRIVER +M: Javier Martinez Canillas <javier@dowhile0.org> L: linux-kernel@vger.kernel.org S: Supported -F: drivers/*/*max77802*.c +F: drivers/regulator/max77802-regulator.c F: Documentation/devicetree/bindings/*/*max77802.txt F: include/dt-bindings/*/*max77802.h |