| commit | 663d3f7c2e5e1b018a4c53277ccfde40329d98ca | [log] [tgz] |
|---|---|---|
| author | Grant Likely <grant.likely@linaro.org> | Mon Aug 11 14:06:23 2014 +0100 |
| committer | Grant Likely <grant.likely@linaro.org> | Mon Aug 11 14:06:23 2014 +0100 |
| tree | a3afcc2d8fe682bdcc4c2e39b47ab3987b38c69a | |
| parent | b775e642bf958a02210ac4d4edd1a1b7067c49fa [diff] | |
| parent | b6ae5dc54b0a5c542d06d46b9083ceb70bf7e083 [diff] |
Merge branch 'devicetree/next-overlay' into devicetree/next Conflicts: drivers/of/testcase-data/testcases.dts