Commit b7c11ec9 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'u300' into devel 

Conflicts:
	arch/arm/Makefile
Updates:
	arch/arm/mach-u300/core.c
	arch/arm/mach-u300/timer.c
parents 06099961 7666c17e
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