diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-10-24 18:04:27 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-10-24 18:04:27 -0400 |
| commit | af1bdb79ca64ceadc7b44b11929b384eff66ce59 (patch) | |
| tree | c4bb4c94acaf44a113edc60dc0661d4282f0f100 /MAINTAINERS | |
| parent | 552a79413a691a09abf1b3707561858422afc53c (diff) | |
| parent | 1021eb4c454312e65365a4700a1f2b33a0654aa4 (diff) | |
Merge branch 'devicetree/arm-linaro-3.1' of git://git.secretlab.ca/git/linux-2.6 into linaro-3.1linux-linaro-3.1-2011.10-2
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 6185d051358..73369be4c24 100644 --- 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 |