diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2014-05-27 10:03:39 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2014-05-27 10:06:05 +0200 |
commit | 331b483f42fb4d04d52ce920ae10a71411c859a4 (patch) | |
tree | 1f6399d3dc5a6a93b54b01bc2bb46b5f26c7dbab /arch/arm/mach-iop13xx/iq81340sc.c | |
parent | Merge branch 'fortglx/3.16/time' of git://git.linaro.org/people/john.stultz/l... (diff) | |
parent | clocksource: Add Freescale FlexTimer Module (FTM) timer support (diff) | |
download | linux-331b483f42fb4d04d52ce920ae10a71411c859a4.tar.xz linux-331b483f42fb4d04d52ce920ae10a71411c859a4.zip |
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
Diffstat (limited to 'arch/arm/mach-iop13xx/iq81340sc.c')
0 files changed, 0 insertions, 0 deletions