summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2017-06-20 12:50:32 +0200
committerThomas Gleixner <tglx@linutronix.de>2017-06-20 12:50:32 +0200
commit8e6cec1c7c5afa489687c90be15d6ed82c742975 (patch)
treebc11ebf33e34303bbc673c59d807686a3659d1e8 /arch
parentdbb236c1ceb697a559e0694ac4c9e7b9131d0b16 (diff)
parent459fa246d8fa4a543ed9a3331f15c8fe1caf9937 (diff)
downloadlinux-8e6cec1c7c5afa489687c90be15d6ed82c742975.tar.bz2
Merge branch 'clockevents/4.12-fixes' of https://git.linaro.org/people/daniel.lezcano/linux into timers/urgent
Pull clockevents fixes from Daniel Lezcano: - Fixed wrong iomem area unmapped in the arch_arm_timer (Frank Rowand) - Added missing includes for sun5i and cadence-ttc (Stephen Rothwell)
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions