Messages in this thread | | | From | "Rafael J. Wysocki" <> | Subject | Re: linux-next: manual merge of the pm tree with the arm tree | Date | Thu, 25 Aug 2011 16:28:18 +0200 |
| |
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!
| |