Skip to content
Commit 54ef3fe6 authored by Jason Cooper's avatar Jason Cooper
Browse files

Merge branch 'mvebu/soc-cpuidle' into mvebu/soc 

Conflicts:
	arch/arm/mach-mvebu/pmsu.c
parents b03e119f e53b1fd4
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