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)
commitc0206e228e34d8b414fcc63db45b831843adea06
tree937c005d696e4e141ac52233a73630f6fdab4ef6
parent648ab3df21add1bdfa21efeeb0b492ec45cb0a07
parent218a28014112b20bd15a9e6305c8b46488830bc4
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