On Thu, Jan 07, 2016 at 09:50:30AM +0100, Michael Adam wrote:

Hi,

the patch contains a conflict resolution artifact..

Thanks, I've fixed it in my tree now. I will wait to hear other comments before I send an update.

-Deepa