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

From: Stephen Rothwell
Date: Mon Aug 24 2009 - 09:14:28 EST

Hi Tony,

On Mon, 24 Aug 2009 16:07:18 +0300 Tony Lindgren <tony@xxxxxxxxxxx> 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.

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature