From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 4 Oct 2012 22:02:26 +0000 (+0100)
Subject: Merge branch 'arch-timers' into for-linus
X-Git-Tag: MMI-PSA29.97-13-9~15819^2~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ceaa1a13c0e53242555fa45887d82339a3f93c78;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'arch-timers' into for-linus

Conflicts:
	arch/arm/include/asm/timex.h
	arch/arm/lib/delay.c
---

ceaa1a13c0e53242555fa45887d82339a3f93c78