-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 03/09/2012 08:37 AM, Stephen Rothwell : > Hi Rob, > > Today's linux-next merge of the cpuidle-cons tree got a conflict > in arch/arm/mach-at91/cpuidle.c between commit 00482a4078f4 ("ARM: > at91: implement the standby function for pm/cpuidle") from the > arm-soc tree and commit 7a1f6e72dce1 ("ARM: at91: Consolidate time > keeping and irq enable") from the cpuidle-cons tree. > > I fixed it up (I think - see below) and can carry the fix as > necessary. Yes: resolution correct. Please carry it. Thanks to Rob and Daniel for their answers. Best regards, - -- Nicolas Ferre -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQEcBAEBAgAGBQJPXh7HAAoJEAf03oE53VmQSQwH/15D3okPxJSEiH0k8IFt6Df0 RDY/CdaGYDllGMq7Yc1LiQAPrlHkv+gFNAJkhH8aJvC603pYBFGIa5IPLeZEE+XD MkXiO7pQAOdGtojqSrZI8Sp0kxtfdR6QlNu5o518yvlKIkxbWJoXdVty9+MuciOv GOR+164hJtlr4fLLg7bTzsdnxquDVBBbks9qLhSYEQBEuNkgXKgNfdMouwVI/Zuj sX9DSKnVVm5LS/rrq888JRPPtBf8/HkmOeFRWKktq7Q8WldQbBI79vj01osH++jf rwDiM/CSC0nhXY0IWEof+Hz1mSinM07XGZglDYwqI1ca7HId2C/txaFI3NtcC7A= =rZpG -----END PGP SIGNATURE----- -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html