From: daniel.lezcano@linaro.org (Daniel Lezcano)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] clockevents/clocksource : new material for 3.14
Date: Mon, 13 Jan 2014 09:27:49 +0100 [thread overview]
Message-ID: <52D3A385.8060504@linaro.org> (raw)
In-Reply-To: <20140112163318.GA21054@gmail.com>
On 01/12/2014 05:33 PM, Ingo Molnar wrote:
[ ... ]
> Pulled into tip:timers/core, thanks Daniel!
>
> Note that there was a conflict in drivers/clocksource/clksrc-of.c,
> caused by interaction with this commit:
>
> 4c4b053235fa clocksource: clksrc-of: Do not drop unheld reference on device node
>
> I've resolved it, but please double check the end result once I've
> pushed it all out.
Done. The resolution is ok.
Thanks !
-- Daniel
--
<http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
prev parent reply other threads:[~2014-01-13 8:27 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-30 10:14 [GIT PULL] clockevents/clocksource : new material for 3.14 Daniel Lezcano
2013-12-30 10:19 ` [PATCH 01/20] clockevent: sun4i: Fill the irq field in the clockevent structure Daniel Lezcano
2013-12-30 10:19 ` [PATCH 02/20] clocksource: sun4i: Change CPU mask to cpu_possible_mask Daniel Lezcano
2013-12-30 10:19 ` [PATCH 03/20] clocksource: sun4i: Increase a bit the clock event and sources rating Daniel Lezcano
2013-12-30 10:19 ` [PATCH 04/20] clocksource: Add Allwinner SoCs HS timers driver Daniel Lezcano
2013-12-30 10:19 ` [PATCH 05/20] ARM: sun5i: a10s: Add support for the High Speed Timers Daniel Lezcano
2013-12-30 10:19 ` [PATCH 06/20] ARM: sun5i: a13: " Daniel Lezcano
2013-12-30 10:19 ` [PATCH 07/20] ARM: sun7i: a20: " Daniel Lezcano
2013-12-30 10:19 ` [PATCH 08/20] clocksource: arm_global_timer: Switch to sched_clock_register() Daniel Lezcano
2013-12-30 10:19 ` [PATCH 09/20] clocksource: cadence_ttc_timer: " Daniel Lezcano
2013-12-30 10:19 ` [PATCH 10/20] clocksource: sun4i: " Daniel Lezcano
2013-12-30 10:19 ` [PATCH 11/20] clocksource: orion: " Daniel Lezcano
2013-12-30 10:19 ` [PATCH 12/20] clocksource: clksrc-of: Warn if no clock sources are found Daniel Lezcano
2013-12-30 10:19 ` [PATCH 13/20] clocksource: armada-370-xp: Enable timer divider only when needed Daniel Lezcano
2013-12-30 10:19 ` [PATCH 14/20] clocksource: sh_tmu: Remove unnecessary platform_set_drvdata() Daniel Lezcano
2013-12-30 10:19 ` [PATCH 15/20] clocksource: sh_mtu2: " Daniel Lezcano
2013-12-30 10:19 ` [PATCH 16/20] clocksource: misc drivers: Remove deprecated IRQF_DISABLED Daniel Lezcano
2013-12-30 10:19 ` [PATCH 17/20] clocksource: tegra: " Daniel Lezcano
2013-12-30 10:19 ` [PATCH 18/20] clocksource: vt8500: " Daniel Lezcano
2013-12-30 10:19 ` [PATCH 19/20] clocksource: bcm_kona_timer: Remove unused bcm_timer_ids Daniel Lezcano
2013-12-30 10:19 ` [PATCH 20/20] clocksource: sh_cmt: Add clk_prepare/unprepare support Daniel Lezcano
2014-01-12 16:33 ` [GIT PULL] clockevents/clocksource : new material for 3.14 Ingo Molnar
2014-01-13 8:27 ` Daniel Lezcano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=52D3A385.8060504@linaro.org \
--to=daniel.lezcano@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).