On Tue, 2011-02-22 at 11:01 -0800, Tony Lindgren wrote: > * Felipe Balbi <[email protected]> [110217 23:33]: > > Hi Tony, > > > > Here's a pull request for the changes we need to get into the upcoming > > merge window. These have been tested overnight on pandaboard. > > > > I also checked that it merges cleanly with your omap-for-linus branch. > > Thanks pulled. Looks like there were few merge confclicts with > the omap2/3 hwmod data, but got those sorted out.
conflict resolution was huge but at a first glance it looks ok. Tomorrow I'll check if there aren't any conflicts between your for-next and Greg's usb-next branch. -- balbi -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
