| commit | c0206e228e34d8b414fcc63db45b831843adea06 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Thu Mar 15 13:45:53 2012 +0000 |
| committer | Arnd Bergmann <arnd@arndb.de> | Thu Mar 15 13:45:53 2012 +0000 |
| tree | 937c005d696e4e141ac52233a73630f6fdab4ef6 | |
| parent | 648ab3df21add1bdfa21efeeb0b492ec45cb0a07 [diff] | |
| parent | 218a28014112b20bd15a9e6305c8b46488830bc4 [diff] |
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