linux-kernel - linux-next: manual merge of the omap

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-next>] [day] [month] [year] [list]

Date:	Mon, 16 Nov 2009 16:04:02 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Tomi Valkeinen <tomi.valkeinen@...ia.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Tony Lindgren <tony@...mide.com>, <linux-omap@...r.kernel.org>
Subject: linux-next: manual merge of the omap_dss2 tree with the omap tree

Hi Tomi,

Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/configs/omap_3430sdp_defconfig between the omap tree and the
omap_dss2 tree.

I just used the version from the omap tree as I can't figure out anything
better, sorry.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped