Merge branch 'vexpress/timer' into next/timer
authorArnd Bergmann <arnd@arndb.de>
Tue, 13 Mar 2012 11:53:09 +0000 (11:53 +0000)
committerArnd Bergmann <arnd@arndb.de>
Tue, 13 Mar 2012 11:53:09 +0000 (11:53 +0000)
commita2821146e6f69566a384b368b90c22e84aaf7ef3
tree6a1534ff81cdc4e65b461f69108019e49481ccea
parent69adb983ce0639d02c87aa9947663d5ad50116d0
parente129440af63879808ee0a40613fd1cece935678e
Merge branch 'vexpress/timer' into next/timer

* vexpress/timer:
  ARM: versatile: Map local timers using Device Tree when possible
  ARM: vexpress: Get rid of MMIO_P2V