Merge branch 'vf610-use-arm-global-timer-v2' into vf610-shared-with-m4 archive/vf610-shared-with-m4
authorStefan Agner <stefan@agner.ch>
Sat, 4 Oct 2014 15:54:05 +0000 (17:54 +0200)
committerStefan Agner <stefan@agner.ch>
Sat, 4 Oct 2014 15:54:05 +0000 (17:54 +0200)
commit256cbba4929ed7d9f0237435892ab00b57fc9d87
treeda6278f616f7fd0ba293f914f183791940b3a89a
parent0f33be009b89d2268e94194dc4fd01a7851b6d51
parentca6917de6b4edb0cf36fa7c33743c500177d69ee
Merge branch 'vf610-use-arm-global-timer-v2' into vf610-shared-with-m4