linux-next: manual merge of the samsung tree

[Stephen Rothwell]

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

Attachment: pgp00000.pgp
Description: PGP signature