On Mon, Jun 28, 2010 at 12:33 PM, Olof Johansson <olof@xxxxxxxxx> wrote: > On Mon, Jun 28, 2010 at 11:56:26AM -0700, Colin Cross wrote: >> These patches are not coming from the tegra/for-next branch, they are >> coming from Grant's devicetree-next branch. Grant, why are these >> patches in your tree, and why is tegra/for-next in your tree? It's >> going to cause conflicts when we rebase our for-next branch. Please >> remove tegra and this sdhci patch from your tree. > > Yeah, this seems to be a mixup by Grant. I gave him a few patches I had > picked up locally to work with, and he seems to have published the > work accidentally. Hi Colin, I've fixed it now. Profuse apologies, sorry for the noise, and I owe you a beer or 3. g. -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
