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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-Id: <20090824231415.79c6909f.sfr@canb.auug.org.au>
Date:	Mon, 24 Aug 2009 23:14:15 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Tony Lindgren <tony@...mide.com>
Cc:	linux-omap@...r.kernel.org, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Syed Rafiuddin <rafiuddin.syed@...com>,
	Russell King <rmk@....linux.org.uk>,
	Kalle Valo <kalle.valo@....fi>
Subject: Re: 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 <tony@...mide.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@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped