Hi Tony,

On Mon, 24 Aug 2009 16:07:18 +0300 Tony Lindgren <tony@atomide.com> wrote:
>
> The merge conflict should be gone now, Kevin realized we don't need the
> platform_data any longer. Will remove that for board-4430sdp.c and serial.h
> as a fix once the other pending changes have been merged.

OK, thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/