Merge branch 'local_timers-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Thu, 15 Mar 2012 13:45:53 +0000 (13:45 +0000)
committerArnd Bergmann <arnd@arndb.de>
Thu, 15 Mar 2012 13:45:53 +0000 (13:45 +0000)
* '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


Trivial merge