On Mon, Sep 14, 2009 at 03:35:32PM +1000, Stephen Rothwell wrote: > Hi Kyle, > > Overlapping changes. I fixed it up (using the parisc versions and adding > > the extra change from the latter security-testing patch) and can carry > > the fixes as necessary. > > This conflict is now between the parisc tree and Linus' tree ... > You don't say. -- 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
