diff options
author | Grant Likely <grant.likely@linaro.org> | 2015-03-29 07:59:58 (GMT) |
---|---|---|
committer | Grant Likely <grant.likely@linaro.org> | 2015-03-29 07:59:58 (GMT) |
commit | a2166ca5f3204794e8b59f01c93a0f1564e3e138 (patch) | |
tree | b667828c308ffd79f1b2bd8fc1da95e43dfef4e3 /MAINTAINERS | |
parent | 37791b6fbe7ab772020e714d34515f144fa981a0 (diff) | |
parent | 01218bf14ee60d4a2d6c667ebdbba3ae9a7a1d66 (diff) | |
download | linux-a2166ca5f3204794e8b59f01c93a0f1564e3e138.tar.xz |
Merge remote-tracking branch 'robh/for-next' into devicetree/next
Conflicts:
drivers/of/unittest.c
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 358eb01..433ac85 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7187,6 +7187,15 @@ F: Documentation/devicetree/ F: arch/*/boot/dts/ F: include/dt-bindings/ +OPEN FIRMWARE AND DEVICE TREE OVERLAYS +M: Pantelis Antoniou <pantelis.antoniou@konsulko.com> +L: devicetree@vger.kernel.org +S: Maintained +F: Documentation/devicetree/dynamic-resolution-notes.txt +F: Documentation/devicetree/overlay-notes.txt +F: drivers/of/overlay.c +F: drivers/of/resolver.c + OPENRISC ARCHITECTURE M: Jonas Bonn <jonas@southpole.se> W: http://openrisc.net |