diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-03-27 13:12:10 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-03-27 13:12:10 +0200 |
| commit | bbad2093dfa76f4c3dcc8ab6b89249affe72f851 (patch) | |
| tree | 5e5373816ff0a7dfc28cf02e533ce59fbc9de1bf /MAINTAINERS | |
| parent | 66f3731f39970ad670ddba02cfb32740911d5da6 (diff) | |
| parent | 0a815fc929e62f54a22a09e10e18f038e6d63c39 (diff) | |
Merge tag 'sunxi-fixes-for-4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into fixes
Pull "Allwinner Fixes for 4.16" from Maxime Ripard:
The first and second patches fix the regulator support for the Bananapi M2
board.
The last one updates my email address in MAINTAINERS.
* tag 'sunxi-fixes-for-4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
MAINTAINERS: update email address for Maxime Ripard
ARM: dts: sun6i: a31s: bpi-m2: add missing regulators
ARM: dts: sun6i: a31s: bpi-m2: improve pmic properties
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index afd8ce33ee6a..3e055f8b907b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1152,7 +1152,7 @@ S: Maintained F: drivers/clk/sunxi/ ARM/Allwinner sunXi SoC support -M: Maxime Ripard <maxime.ripard@free-electrons.com> +M: Maxime Ripard <maxime.ripard@bootlin.com> M: Chen-Yu Tsai <wens@csie.org> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained @@ -4626,7 +4626,7 @@ F: include/uapi/drm/drm* F: include/linux/vga* DRM DRIVERS FOR ALLWINNER A10 -M: Maxime Ripard <maxime.ripard@free-electrons.com> +M: Maxime Ripard <maxime.ripard@bootlin.com> L: dri-devel@lists.freedesktop.org S: Supported F: drivers/gpu/drm/sun4i/ |