From mboxrd@z Thu Jan  1 00:00:00 1970
From: nsekhar@ti.com (Sekhar Nori)
Date: Tue, 27 May 2014 13:40:18 +0530
Subject: [GIT PULL 01/02] DaVinci EDMA clean-up for v3.16
In-Reply-To: <20140526215858.GU27093@quad.lixom.net>
References: <1400924613-24451-1-git-send-email-nsekhar@ti.com>
 <20140526214307.GR27093@quad.lixom.net>
 <20140526215858.GU27093@quad.lixom.net>
Message-ID: <5384486A.4030006@ti.com>
To: linux-arm-kernel@lists.infradead.org
List-Id: linux-arm-kernel.lists.infradead.org

On Tuesday 27 May 2014 03:28 AM, Olof Johansson wrote:

> This had a conflict with the fix from Thomas that fixes the binding. To
> avoid this, you could have merged Vinod's branch in on top of the fix branch
> you had, then build your new contents on top.

I did notice the conflict, but did not think about merging my fixes
branch in.

> Anyway, not a huge deal, but something to tweak in the future.

Thanks. Will keep in mind.

Regards,
Sekhar