Merge branch 'devicetree/next-overlay' into devicetree/next

Conflicts: drivers/of/testcase-data/testcases.dts
2014-08-11 14:06:23 +01:00
parent b775e642bf b6ae5dc54b
commit 663d3f7c2e
14 changed files with 1058 additions and 447 deletions
--- a/drivers/of/testcase-data/testcases.dts
+++ b/drivers/of/testcase-data/testcases.dts
@@ -1,4 +1,14 @@
 /dts-v1/;
+/ {
+	testcase-data {
+		changeset {
+			prop-update = "hello";
+			prop-remove = "world";
+			node-remove {
+			};
+		};
+	};
+};
 #include "tests-phandle.dtsi"
 #include "tests-interrupts.dtsi"
 #include "tests-match.dtsi"