diff options
author | Rob Herring <robh@kernel.org> | 2018-03-08 16:21:07 +0100 |
---|---|---|
committer | Rob Herring <robh@kernel.org> | 2018-03-08 16:21:07 +0100 |
commit | c679fa6e3aaa5c58fc514b5b88cfa82774b8d390 (patch) | |
tree | 0c10b339368bd1795152a66a4e245e6f654fb3ec /MAINTAINERS | |
parent | of: unittest: fix an error test in of_unittest_overlay_8() (diff) | |
parent | scripts: turn off some new dtc warnings by default (diff) | |
download | linux-c679fa6e3aaa5c58fc514b5b88cfa82774b8d390.tar.xz linux-c679fa6e3aaa5c58fc514b5b88cfa82774b8d390.zip |
Merge branch 'dtc-update' into dt/next
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 4783763df026..248f4266c6bd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7912,7 +7912,6 @@ S: Maintained F: scripts/leaking_addresses.pl LED SUBSYSTEM -M: Richard Purdie <rpurdie@rpsys.net> M: Jacek Anaszewski <jacek.anaszewski@gmail.com> M: Pavel Machek <pavel@ucw.cz> L: linux-leds@vger.kernel.org @@ -9209,6 +9208,7 @@ MIPS GENERIC PLATFORM M: Paul Burton <paul.burton@mips.com> L: linux-mips@linux-mips.org S: Supported +F: Documentation/devicetree/bindings/power/mti,mips-cpc.txt F: arch/mips/generic/ F: arch/mips/tools/generic-board-config.sh @@ -9948,6 +9948,7 @@ F: drivers/nfc/nxp-nci OBJTOOL M: Josh Poimboeuf <jpoimboe@redhat.com> +M: Peter Zijlstra <peterz@infradead.org> S: Supported F: tools/objtool/ |