lkml.org 
[lkml]   [2012]   [Sep]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the clk tree with the arm-soc tree
Hi Mike,

Today's linux-next merge of the clk tree got a conflict in
arch/arm/mach-ux500/clock.c between commit 79964bcd792f ("ARM: ux500:
Correct Ux500 family names usage") from the arm-soc tree and commit
ebc96db7632f ("ARM: ux500: Switch to use common clock framework") from
the clk tree.

The latter removed the file so I did that - there may be more fixup
required.

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2012-09-10 09:01    [W:0.029 / U:0.376 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site