Messages in this thread | | | Date | Mon, 13 Jan 2014 09:27:49 +0100 | From | Daniel Lezcano <> | Subject | Re: [GIT PULL] clockevents/clocksource : new material for 3.14 |
| |
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
-- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |