Skip to content
Commit 6d55d596 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'next/soc' into HEAD 

Conflicts:
	arch/arm/mach-ux500/clock.c
	arch/arm/mach-ux500/cpu.c
	drivers/clocksource/Makefile
parents f7b967bf b6e3b5c2
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