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

From: Nicolas Ferre <[email-masked]>
Date: Mon, 26 Nov 2012 11:39:42 +0100

On 11/26/2012 11:31 AM, Stephen Rothwell :
> Hi all,
> 
> Today's linux-next merge of the arm-soc tree got a conflict in 
> drivers/tty/serial/atmel_serial.c between commit 95e629b761ce 
> ("ARM/AVR32: get rid of serial_at91.h") from the arm tree and
> commit bcd2360c1ff9 ("arm: at91: move platfarm_data to 
> include/linux/platform_data/atmel.h") from the arm-soc tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no
> action is required).

Yes, good fix that has to be carried...

Thanks, bye,
- -- 
Nicolas Ferre