Messages in this thread | | | Date | Thu, 26 Jul 2012 16:10:22 -0700 | From | "Mark A. Greer" <> | Subject | Re: [GIT PULL 00/15] arm-soc: changes for v3.6 |
| |
On Tue, Jul 24, 2012 at 02:51:35PM -0600, Paul Walmsley wrote: > Hi > > On Tue, 24 Jul 2012, Arnd Bergmann wrote: > > > On Tuesday 24 July 2012, Linus Torvalds wrote: > > > > > In your "for-linus" branch, "&mpu_3xxx_clkdm" remains in the > > > clockdomains_common[] array. In my merge, it is gone. But I think I > > > did the merge correctly, and you did it wrong. HOWEVER, I don't know > > > the code, maybe there is some subtle reason why you did it like you > > > did. > > > > Yes, I think you are right now that I look at it again. Paul Walmsley > > can have another look at the merge and send an update if we are both > > missing something now. > > Linus' merge is correct.
FWIW, it looks right to me too.
Thanks,
Mark
| |