Skip to content
Commit a2821146 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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
parents 69adb983 e129440a
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment