[GIT PULL 5/5] ARM: mvebu: changes for v3.8

[arnd@arndb.de (Arnd Bergmann)]

On Monday 26 November 2012, Thomas Petazzoni wrote:
> Right. The problem is that some of the last developments had many
> dependencies against the previous developments, from various branches.
> So I wasn't sure how to do this last developments, and I did merge the
> branches containing the previous developments that I needed.
> 
> I am really open to suggestions on how to improve my Git workflow to
> handle this better. It certainly wasn't my intention to have this
> "test-the-merge" thing appear publicly.
> 

One thing that Sascha Hauer first introduced was an extra branch that
has everything merged together to show how you want to handle
the conflicts. We'll then merge the individual branches and in the
end can check if there is any difference to what you had.

	Arnd