Re: linux-next: manual merge of the samsung tree with the arm-soctree

[Stephen Rothwell]

Hi Kukjin,

On Fri, 11 Jan 2013 15:32:06 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the samsung tree got conflicts in
> many files with the arm-soc tree.
> 
> I just dropped the samsung tree for today.  Please have a look and try to
> fix this mess up, thanks.

Ping?

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature