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

Merge branch 'arch-timers' into for-linus 

Conflicts:
	arch/arm/include/asm/timex.h
	arch/arm/lib/delay.c
parents ba4a63f8 56942fec
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