From: Arnd Bergmann 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-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c0206e228e34d8b414fcc63db45b831843adea06;p=linux-beck.git Merge branch 'local_timers-for-arm-soc' of git://git.kernel.org/pub/scm/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