linux-next: manual merge of the mmc tree with the s5p tree

From: Stephen Rothwell
Date: Mon Mar 26 2012 - 23:10:42 EST

Hi Chris,

This conflict has been caused in part because you rebased your tree and
copied some commits that used to be merged into your tree from a shared
branch. Do *not* do that ... BTW, when you rebased those commits into
your tree, you did not sign them either. This is exactly what Linus has
just berated one of the other maintainers for ...

I am not fixing this conflict, I am just using the version of your tree
that I have from next-20120326. Please fix your tree up properly.

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature