On Tue, 2011-02-22 at 13:01 -0600, Tony Lindgren wrote: > Hi, > > * Tomi Valkeinen <tomi.valkeinen@xxxxxx> [110222 02:07]: > > Hi Tony, > > > > The following mach-omap2 patches have been reviewed and are in DSS tree, > > but cause easily conflicts with linux-omap tree. > > > > Would it be possible for you to pull these into linux-omap? > > Sure, but see below. > > > The patches are based on today's linux-omap/master. > > Can you please base thes on current omap-for-linus at > 04aa67dec63b61c1a8b9b6d001262250f1a92130? (Just pushed it > with the omap4 hwmod fix for timer1) > > I can't pull in the master branch into omap-for-linus as that > contains years of history of temporary commits. Ah, of course. I updated the branch git://gitorious.org/linux-omap-dss2/linux.git for-tony to be based on omap-for-linus. Minor conflicts in 3430sdp board file, otherwise the commits are the same. Tomi -- 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
