[lkml]   [2011]   [Dec]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the s5p tree with the arm tree
Hi Kukjin,

Today's linux-next merge of the s5p tree got a conflict in
arch/arm/mach-s5p64x0/init.c between commit 95af214becab ("ARM: 7246/1:
S5P64X0: introduce arch/arm/mach-s5p64x0/common.[ch]") from the arm tree
and commit afba7f91e640 ("ARM: SAMSUNG: remove struct
's3c24xx_uart_clksrc' and all uses of it") from the s5p tree.

I just removed the file, but the latter patch will probably need applying
in some form to arch/arm/mach-s5p64x0/common.c.
Stephen Rothwell
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2011-12-28 00:35    [W:0.033 / U:0.648 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site