Skip to content
Snippets Groups Projects
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
No related merge requests found
Showing
with 634 additions and 305 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment