Date: Mon, 16 Nov 2009 16:04:02 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
       Tony Lindgren <tony@atomide.com>, <linux-omap@vger.kernel.org>
Subject: linux-next: manual merge of the omap_dss2 tree with the omap tree
Message-Id: <20091116160402.deb0cc82.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="PGP-SHA1";
 boundary="Signature=_Mon__16_Nov_2009_16_04_02_+1100_pglOm8c+LX.3hCOg"
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1146
Lines: 35

--Signature=_Mon__16_Nov_2009_16_04_02_+1100_pglOm8c+LX.3hCOg
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

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.
--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

--Signature=_Mon__16_Nov_2009_16_04_02_+1100_pglOm8c+LX.3hCOg
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEARECAAYFAksA3UMACgkQjjKRsyhoI8wjxwCguXcAhpSagB+XI4xxRgdDt5wQ
0+sAoJ9Xz8fAGL/tMHOcXYAwUeJctC0j
=kUsX
-----END PGP SIGNATURE-----

--Signature=_Mon__16_Nov_2009_16_04_02_+1100_pglOm8c+LX.3hCOg--
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/