diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-13 11:53:09 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-13 11:53:09 +0000 |
| commit | a2821146e6f69566a384b368b90c22e84aaf7ef3 (patch) | |
| tree | 6a1534ff81cdc4e65b461f69108019e49481ccea /usr | |
| 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
Diffstat (limited to 'usr')
0 files changed, 0 insertions, 0 deletions