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)
* vexpress/timer:
  ARM: versatile: Map local timers using Device Tree when possible
  ARM: vexpress: Get rid of MMIO_P2V


Trivial merge