Subject: Re: linux-next: manual merge of the s5p tree with the arm-soc tree

From: Ben Dooks <[email-masked]>
Date: Wed, 20 Jul 2011 11:13:58 +0100

On Wed, Jul 20, 2011 at 11:35:36AM +1000, Stephen Rothwell wrote:
> Hi Kukjin,
> 
> Today's linux-next merge of the s5p tree got conflicts in drivers/tty/serial/s3c2400.c and drivers/tty/serial/s3c24a0.c between commits 632b7cf6c056 ("ARM: mach-s3c2400: delete") and af0e060e24ce ("ARM: mach-s3c24a0: delete")from the arm-soc tree and commit 470805f8f958 ("serial: Remove redundant console_initcall from s3c and s5p console drivers") from the s5p tree.
> 
> The former removes these files, so I did that.

Yes, there's little chance of these socs ever being added, so nico
removed all reference to them.

-- 
Ben Dooks, [email-masked], http://www.fluff.org/ben/

Large Hadron Colada: A large Pina Colada that makes the universe disappear.