From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 13 Mar 2012 11:53:09 +0000 (+0000)
Subject: Merge branch 'vexpress/timer' into next/timer
X-Git-Tag: MMI-PSA29.97-13-9~17172^2~4
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a2821146e6f69566a384b368b90c22e84aaf7ef3;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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
---

a2821146e6f69566a384b368b90c22e84aaf7ef3