[GIT PULL] ARM: OMAP2+: hwmod data: cleanup in preparation for link array removal

Paul Walmsley paul at pwsan.com
Thu Mar 8 21:04:31 EST 2012


on second thought...

On Thu, 8 Mar 2012, Paul Walmsley wrote:

> On Thu, 8 Mar 2012, Tony Lindgren wrote:
> > Got these now merged into l-o master, but ran into a merge
> > conflict with already queued sr branch. Resolved it by using
> > your version except left out vdd_name.
> Definitely we want the vdd_name fields.  Other than that it looks okay.  

I guess that other SR series that you merged removed the vdd_name fields?

If so then yeah, we'd better leave those out.

This means that I'm going to have to rebase those big hwmod data changes 

Can you send me a stable commit for that?

- Paul

More information about the linux-arm-kernel mailing list