* Cousson, Benoit <b-cousson@xxxxxx> [110217 03:05]: > > > >McSPI is already merged to l-o master. Will not this series breaks spi > >hwmod? The master branch is just a merge of the various branches, I have not yet merged any of the hwmod touching branches into omap-for-linus. > It will not break, it will just make the merge a little bit painful > for Tony if we do not re-submit the updated McSPI hwmod data for > OMAP4. I'll apply Benoit's patches first, then merge or rebase the hwmod data touching branches with that. This way following hwmod related patches will not have merge conflicts. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
