Skip to content
Commit 404a02cb authored by Russell King's avatar Russell King
Browse files

Merge branch 'devel-stable' into devel 

Conflicts:
	arch/arm/mach-pxa/clock.c
	arch/arm/mach-pxa/clock.h
parents 28cdac66 1051b9f0
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