Subject: Re: linux-next: manual merge of the input tree with the input-current tree

From: Dmitry Torokhov <[email-masked]>
Date: Wed, 1 Sep 2010 19:46:17 -0700

On Thu, Sep 02, 2010 at 11:59:58AM +1000, Stephen Rothwell wrote:
> Hi Dmitry,
> 
> Today's linux-next merge of the input tree got a conflict in
> drivers/input/touchscreen/Makefile between commit
> 948e90e22f01287302d84b5b8d4ba330a41dbf8a ("Input: mrst-touchscreen - move
> out of staging") from the input-current tree and commit
> 3045a5f5202a1e0ab6ba2bf90a786cf4cae6932a ("Input: add LPC32xx touchscreen
> controller driver") from the input tree.
> 
> Just overlapping additions.  I fixed it up (see below) and can carry the
> fix for a while.

Doh! I did not mean to put mrst changes into 'for-linus'. It is too late
to re-fetch, isn't it?

-- 
Dmitry