Re: linux-next: manual merge of the pm tree with the arm tree

[Rafael J. Wysocki]

On Thursday, August 25, 2011, Stephen Rothwell wrote:
> Hi Rafael,
> 
> Today's linux-next merge of the pm tree got a conflict in
> arch/arm/mach-shmobile/board-ap4evb.c between commit 9b742024026c ("ARM:
> mach-shmobile: Setup consistent dma size at boot time") from the arm tree
> and commit 2f82df20d71c ("PM: Move clock-related definitions and headers
> to separate file") from the pm tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Thanks a lot!
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/