Skip to content
Commit 663d3f7c authored by Grant Likely's avatar Grant Likely
Browse files

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

Conflicts:
	drivers/of/testcase-data/testcases.dts
parents b775e642 b6ae5dc5
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment