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

Merge branch 'stericsson/fixes' into next/cleanup 

Conflicts:
	arch/arm/mach-ux500/cpu.c
parents 71f2c153 1bf6d2c1
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