[PATCH 0/8] OMAP4: hwmod data: Add a bunch of IPs
Tony Lindgren
tony at atomide.com
Thu Feb 17 11:17:57 EST 2011
* Cousson, Benoit <b-cousson at ti.com> [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
More information about the linux-arm-kernel
mailing list