diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-12-10 20:47:22 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-12-10 20:47:22 +0100 |
| commit | 5d5119a476f77b57381ddd66d4f7034a5447480b (patch) | |
| tree | f6bc77f6bcc06ee5582d6cf586e3dca5167063f3 /net/unix/af_unix.c | |
| parent | 17b2112f332db7c2bac56926c9e627807bce3615 (diff) | |
| parent | 9ab4727c1d41e50b67aecde4bf11879560a3ca78 (diff) | |
Merge branch 'clockevents/fixes' of git://git.linaro.org/people/daniel.lezcano/linux into timers/urgent
Pull clockevents/clocksource fixes from Daniel Lezcano:
* Axel Lin added a missing dependency on CLKSRC_MMIO in the Kconfig
for the time-efm32
* Dinh Nguyen fixed read_sched_clock to return the right value and
added the clksrc-of missing definition for the dw_apb_timer
* Ezequiel Garcia registered the sched clock after the counter,
thus preventing time jump in the traces for the armada-370-xp
* Marc Zyngier stopped the timer before enabling the irq in order
to prevent it to be fired before the clockevent is registered for
the sunxi
* Thierry Reding removed a of_node_put in clksrc-of because the
reference is not held
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions