Grant Likely 663d3f7c2e Merge branch 'devicetree/next-overlay' into devicetree/next ... Conflicts: drivers/of/testcase-data/testcases.dts		2014-08-11 14:06:23 +01:00
..
testcases.dts	Merge branch 'devicetree/next-overlay' into devicetree/next	2014-08-11 14:06:23 +01:00
tests-interrupts.dtsi	…
tests-match.dtsi	…
tests-phandle.dtsi	…
tests-platform.dtsi	…