Subject: [GIT PULL 01/02] DaVinci EDMA clean-up for v3.16

From: [email-masked] (Sekhar Nori)
Date: Tue, 27 May 2014 13:40:18 +0530

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