Date: Tue, 8 Dec 2009 11:17:22 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Ben Dooks <ben-linux@fluff.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: linux-next: manual merge of the samsung tree
Message-Id: <20091208111722.2e8d9527.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="PGP-SHA1";
 boundary="Signature=_Tue__8_Dec_2009_11_17_22_+1100_2pW2R9.8ZAE/68q1"
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1272
Lines: 36

--Signature=_Tue__8_Dec_2009_11_17_22_+1100_2pW2R9.8ZAE/68q1
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi Ben,

In today's linux-next merge of the samsung tree I noticed that the file
arch/arm/plat-s3c/dev-hsmmc2.c actually has some merge conflict artifacts
in it.

I fixed them up (just by using the version from the arm tree) but it
would be good if this could be fixed in your tree as well (I notice that
Russell has already merged a (presumable) correct version of these files).
--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

--Signature=_Tue__8_Dec_2009_11_17_22_+1100_2pW2R9.8ZAE/68q1
Content-Type: application/pgp-signature

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

iEYEARECAAYFAksdmxIACgkQjjKRsyhoI8yriQCeMXRHL3ytHBSqDdgxTTa+MqNu
Q2oAoIpkAnQhI2kek260pMQ41DbzySan
=mOOe
-----END PGP SIGNATURE-----

--Signature=_Tue__8_Dec_2009_11_17_22_+1100_2pW2R9.8ZAE/68q1--
--
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/