On Mon, Jun 11, 2012 at 03:50:29PM +0100, Lee Jones wrote:

On 11/06/12 15:27, Mark Brown wrote:

quoted

It'll merge out fine, it's just icky having the same thing appear twice
in history.  Not the end of the world.

Understood. So does this mean you will to push them into the -rcs?

Yes.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120611/cca0d1ca/attachment-0001.sig>