[lkml]   [2009]   [Aug]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the omap tree with the arm tree
Hi Tony,

On Mon, 24 Aug 2009 16:07:18 +0300 Tony Lindgren <> 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
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2009-08-24 15:17    [from the cache]
©2003-2014 Jasper Spaans. hosted at Digital Ocean