From: Thomas Gleixner <tglx@linutronix.de>
Date: Tue, 27 May 2014 08:03:39 +0000 (+0200)
Subject: Merge branch 'clockevents/3.16' of git://git.linaro.org/people/daniel.lezcano/linux... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=331b483f42fb4d04d52ce920ae10a71411c859a4;p=linux-beck.git

Merge branch 'clockevents/3.16' of git://git.linaro.org/people/daniel.lezcano/linux into timers/core

This pull request contains the following changes:

* Laurent Pinchart did a lot of modifications to prepare the DT
  support.  These modifications include a lot of cleanup (structure
  renaming, preparation to support multiple channel, kzalloc usage,
  ...) and then finishes to drop the old code to the new one.

* Jingoo Han removed the dev_err when an allocation fails because this
  error is already given by the mm subsystems.

* Matthew Leach added the ARM global timer with vexpress, enabled the
  ARM global timer with the A5 and added the definition in the DT. He
  also fixed a invalid check when looking for an usable ARM global
  timer for A9

* Maxime Ripard added the support for AllWinner A31 for sun4i and made
  the timer reset optional through the DT

* Stephen Boyd used the msm timer for the udelay

* Uwe Kleine-König fixed the non-standard 'compatible' binding for efm32

* Xiubo Li clarified the types for the clocksource_mmio_read* and
  added a new Flextimer Module (FTM) with its bindings

* Yang Wei added the 'notrace' attribute to 'read_sched_clock' for the
  dw_apb_timer
---

331b483f42fb4d04d52ce920ae10a71411c859a4