The following commit has been merged in the linux branch: commit 860c44c1968bf9ac401f058549b687fde72ff02a Author: Grant Likely grant.likely@secretlab.ca Date: Mon Oct 26 16:49:49 2009 -0700

MAINTAINERS: add Open Firmware / Flattened Device Tree entry

Signed-off-by: Grant Likely grant.likely@secretlab.ca Cc: Joe Perches joe@perches.com Signed-off-by: Andrew Morton akpm@linux-foundation.org Signed-off-by: Linus Torvalds torvalds@linux-foundation.org

diff --git a/MAINTAINERS b/MAINTAINERS index 23a61d9..6300866 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3885,6 +3885,15 @@ S: Maintained F: Documentation/i2c/busses/i2c-ocores F: drivers/i2c/busses/i2c-ocores.c

+OPEN FIRMWARE AND FLATTENED DEVICE TREE +M: Grant Likely grant.likely@secretlab.ca +L: devicetree-discuss@lists.ozlabs.org +W: http://fdt.secretlab.ca +S: Maintained +F: drivers/of +F: include/linux/of*.h +K: of_get_property + OPROFILE M: Robert Richter robert.richter@amd.com L: oprofile-list@lists.sf.net