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

Merge remote-tracking branch 'robh/for-next' into devicetree/next 

Conflicts:
	drivers/of/unittest.c
parents 37791b6f 01218bf1
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