Skip to content
Commit 7b9dd471 authored by Russell King's avatar Russell King
Browse files

Merge branch 'restart' into for-linus 

Conflicts:
	arch/arm/mach-exynos/cpu.c

The changes to arch/arm/mach-exynos/cpu.c were moved to
mach-exynos/common.c.
parents 2e0e9434 0575fb75
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