From: Arnd Bergmann Date: Tue, 13 Mar 2012 11:53:09 +0000 (+0000) Subject: Merge branch 'vexpress/timer' into next/timer X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a2821146e6f69566a384b368b90c22e84aaf7ef3;p=linux-beck.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