From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 15 Mar 2012 13:45:53 +0000 (+0000)
Subject: Merge branch 'local_timers-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.4-rc1~90^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0206e228e34d8b414fcc63db45b831843adea06;p=pandora-kernel.git

Merge branch 'local_timers-for-arm-soc' of git://git./linux/kernel/git/maz/arm-platforms into next/timer

* 'local_timers-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms:
  ARM: ux500: fix compilation after local timer rework
---

c0206e228e34d8b414fcc63db45b831843adea06