conflicts between omap/cleanup branch and omap_dss2 tree | linux-arm-kernel | Ratatoskr

conflicts between omap/cleanup branch and omap_dss2 tree · arnd@arndb.de (Arnd Bergmann) · 2011-07-17
conflicts between omap/cleanup branch and omap_dss2 tree · tony@atomide.com (Tony Lindgren) · 2011-07-18
conflicts between omap/cleanup branch and omap_dss2 tree · Archit Taneja <hidden> · 2011-07-19
conflicts between omap/cleanup branch and omap_dss2 tree · arnd@arndb.de (Arnd Bergmann) · 2011-07-19
conflicts between omap/cleanup branch and omap_dss2 tree · Tomi Valkeinen <hidden> · 2011-07-21
conflicts between omap/cleanup branch and omap_dss2 tree · arnd@arndb.de (Arnd Bergmann) · 2011-07-21

conflicts between omap/cleanup branch and omap_dss2 tree

From: arnd@arndb.de (Arnd Bergmann)
Date: 2011-07-21 14:20:21
Also in: linux-omap

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