Merge branch 'for-arm-soc/arch-timers' of git://git.kernel.org/pub/scm/linux/kernel...
authorMarc Zyngier <marc.zyngier@arm.com>
Mon, 11 Feb 2013 19:03:52 +0000 (19:03 +0000)
committerMarc Zyngier <marc.zyngier@arm.com>
Mon, 11 Feb 2013 19:03:52 +0000 (19:03 +0000)

Trivial merge