: Re: linux-next: manual merge of the clk tree with the keystone tree
>
>
>On 02/26/2014 09:15 AM, Stephen Rothwell wrote:
>> Hi Mike,
>>
>> Today's linux-next merge of the clk tree got a conflict in
>> arch/arm/boot/dts/keystone-clocks.dtsi between commit 0cfc
On Wednesday 26 February 2014 06:41 AM, Khoronzhuk, Ivan wrote:
>
> On 02/26/2014 09:15 AM, Stephen Rothwell wrote:
>> Hi Mike,
>>
>> Today's linux-next merge of the clk tree got a conflict in
>> arch/arm/boot/dts/keystone-clocks.dtsi between commit 0cfc9ccec2a8 ("ARM:
>> dts: keystone: preparator
On 02/26/2014 09:15 AM, Stephen Rothwell wrote:
Hi Mike,
Today's linux-next merge of the clk tree got a conflict in
arch/arm/boot/dts/keystone-clocks.dtsi between commit 0cfc9ccec2a8 ("ARM:
dts: keystone: preparatory patch to support K2L and K2E SOCs") from the
keystone tree and commit 565bbdcd
On Tue, Feb 25, 2014 at 11:15 PM, Stephen Rothwell
wrote:
> Hi Mike,
>
> Today's linux-next merge of the clk tree got a conflict in
> arch/arm/boot/dts/keystone-clocks.dtsi between commit 0cfc9ccec2a8 ("ARM:
> dts: keystone: preparatory patch to support K2L and K2E SOCs") from the
> keystone tree
Hi Mike,
Today's linux-next merge of the clk tree got a conflict in
arch/arm/boot/dts/keystone-clocks.dtsi between commit 0cfc9ccec2a8 ("ARM:
dts: keystone: preparatory patch to support K2L and K2E SOCs") from the
keystone tree and commit 565bbdcd3b91 ("ARM: keystone: dts: fix clkvcp3
control regi
5 matches
Mail list logo