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

Merge branch 's3c-move' into devel 

Conflicts:

	arch/arm/mach-versatile/core.c
parents b6825d2d d5120ae7
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