On Fri, Sep 19, 2008 at 2:46 AM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > Hi Eric, > > Today's linux-next merge of the pxa tree got a lot of conflicts against > the arm tree. Unfortunately, I don't have time today to resolve them, so > you should probably rebase your tree on the arm tree (or merge the arm > tree into yours) and resolve the conflicts. Done. Most of the patches have been merged into the arm tree, so I just reset the 'for-next' to the mainline again. Sorry for the noise. -- 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
