| commit | a2821146e6f69566a384b368b90c22e84aaf7ef3 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Tue Mar 13 11:53:09 2012 +0000 |
| committer | Arnd Bergmann <arnd@arndb.de> | Tue Mar 13 11:53:09 2012 +0000 |
| tree | 6a1534ff81cdc4e65b461f69108019e49481ccea | |
| parent | 69adb983ce0639d02c87aa9947663d5ad50116d0 [diff] | |
| parent | e129440af63879808ee0a40613fd1cece935678e [diff] |
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