diff --git a/[refs] b/[refs]
index 98ad8b6abf46..a03bf43d03ca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7c4fb18d0026bdb70d287a97ba9c38a649bf39e
+refs/heads/master: 860c44c1968bf9ac401f058549b687fde72ff02a
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index 23a61d9d0e78..63008663f4ad 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/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