Skip to content
Commit 0c9de3c5 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'for_3.7/omap5_arch_timer' of... 

Merge branch 'for_3.7/omap5_arch_timer' of git://github.com/SantoshShilimkar/linux into devel-dt-arch-timer

Conflicts:
	arch/arm/mach-omap2/timer.c
parents 6bfc82ff 3c7c5dab
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