On Monday 16 March 2009, Stephen Rothwell wrote:
> Hi Rafael,
Hi,
> Today's linux-next merge of the suspend tree got a conflict in
> drivers/xen/manage.c between commit
> f7df8ed164996cd2c6aca9674388be6ef78d8b37 ("cpumask: convert misc driver
> functions") from the cpus4096 tree and commit
> 73263bc09332c5c8de7c60cb76b5b24e2da66b42 ("PM: Rework handling of
> interrupts during suspend-resume") from the suspend tree.
>
> I fixed it up (see below) and can carry the fix as necessary. As you
> said, it is trivial.
Please do, if that's not a problem.
Thanks,
Rafael
--
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
