Re: [PATCH 0/2] Fix potential merge conflict for dw_apb_timer_of

2013-06-18 Thread Heiko Stübner
Hi Pavel, Am Dienstag, 18. Juni 2013, 17:02:44 schrieb Pavel Machek: Hi! The following 2 patches will eliminate the need for the patch in John Stultz's tree. If there is to be merge of the 2 trees, then the patch: dw_apb_timer_of.c: Remove parts that were picoxcell-specific can

Re: [PATCH 0/2] Fix potential merge conflict for dw_apb_timer_of

2013-06-18 Thread John Stultz
On 06/18/2013 11:28 AM, Heiko Stübner wrote: Am Dienstag, 18. Juni 2013, 17:38:35 schrieb Heiko Stübner: Hi Pavel, Am Dienstag, 18. Juni 2013, 17:02:44 schrieb Pavel Machek: Hi! The following 2 patches will eliminate the need for the patch in John Stultz's tree. If there is to be merge of

Re: [PATCH 0/2] Fix potential merge conflict for dw_apb_timer_of

2013-06-18 Thread Heiko Stübner
Am Dienstag, 18. Juni 2013, 17:38:35 schrieb Heiko Stübner: Hi Pavel, Am Dienstag, 18. Juni 2013, 17:02:44 schrieb Pavel Machek: Hi! The following 2 patches will eliminate the need for the patch in John Stultz's tree. If there is to be merge of the 2 trees, then the patch:

Re: [PATCH 0/2] Fix potential merge conflict for dw_apb_timer_of

2013-06-18 Thread Olof Johansson
On Tue, Jun 18, 2013 at 11:40 AM, John Stultz john.stu...@linaro.org wrote: On 06/18/2013 11:28 AM, Heiko Stübner wrote: Am Dienstag, 18. Juni 2013, 17:38:35 schrieb Heiko Stübner: Hi Pavel, Am Dienstag, 18. Juni 2013, 17:02:44 schrieb Pavel Machek: Hi! The following 2 patches will

[PATCH 0/2] Fix potential merge conflict for dw_apb_timer_of

2013-06-17 Thread dinguyen
From: Dinh Nguyen dingu...@altera.com Hi Arnd/Olof, Because of the following patch series that is currently in arm-soc/for-next: 10021488997317d1121505a7ac659124c058efed clocksource: dw_apb_timer_of: use clocksource_of_init 1b4eca0f634be2a99f2baa6c29dfd183590ead3f clocksource: dw_apb_timer_of:

Re: [PATCH 0/2] Fix potential merge conflict for dw_apb_timer_of

2013-06-17 Thread John Stultz
On 06/17/2013 05:08 PM, dingu...@altera.com wrote: From: Dinh Nguyen dingu...@altera.com Hi Arnd/Olof, Because of the following patch series that is currently in arm-soc/for-next: 10021488997317d1121505a7ac659124c058efed clocksource: dw_apb_timer_of: use clocksource_of_init