conflicts between omap/cleanup branch and omap_dss2 tree

Arnd Bergmann arnd at arndb.de
Thu Jul 21 10:20:21 EDT 2011


On Thursday 21 July 2011, Tomi Valkeinen wrote:
> I've pushed a new for-next branch to
> git://gitorious.org/linux-omap-dss2/linux.git for-next. However, I
> decided to just reset it to -rc4 for now.
> 
Ok, thanks!

I've removed the merge with that branch from arm-soc/for-next now.

	Arnd



More information about the linux-arm-kernel mailing list