Merge commit 'v3.1' into devicetree/next

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 6185d05..73369be 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4728,10 +4728,12 @@ F:      drivers/i2c/busses/i2c-ocores.c
 
 OPEN FIRMWARE AND FLATTENED DEVICE TREE
 M:     Grant Likely <grant.likely@secretlab.ca>
+M:     Rob Herring <rob.herring@calxeda.com>
 L:     devicetree-discuss@lists.ozlabs.org (moderated for non-subscribers)
 W:     http://fdt.secretlab.ca
 T:     git git://git.secretlab.ca/git/linux-2.6.git
 S:     Maintained
+F:     Documentation/devicetree
 F:     drivers/of
 F:     include/linux/of*.h
 K:     of_get_property