Skip to content
Commit 7f585bbf authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'omap-timer-for-v3.10' of git://github.com/jonhunter/linux into omap-for-v3.10/timer 

Conflicts:
	arch/arm/mach-omap2/timer.c
parents 43231b5b 4615943c
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment