Skip to content
Commit ab2f75ce authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'depends/driver-core' into ux500/dt 

Conflicts:
	drivers/base/cpu.c
parents f56b71f5 da5a70f3
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment