From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 21 Aug 2013 12:59:23 +0000 (+0200)
Subject: Merge branch 'timers/clockevents-next' of git://git.linaro.org/people/dlezcano/clocke... 
X-Git-Tag: v3.12-rc1~166^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cfb6d656d569510ac9239583ce09e4c92ad54719;p=pandora-kernel.git

Merge branch 'timers/clockevents-next' of git://git.linaro.org/people/dlezcano/clockevents into timers/core

* Support for memory mapped arch_timers
* Trivial fixes to the moxart timer code
* Documentation updates

Trivial conflicts in drivers/clocksource/arm_arch_timer.c. Fixed up
the newly added __cpuinit annotations as well.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---

cfb6d656d569510ac9239583ce09e4c92ad54719
Reading git-diff-tree failed