Subject: RE: linux-next: manual merge of the input tree with the s5p tree

From: Kukjin Kim <[email-masked]>
Date: Tue, 15 Nov 2011 16:26:21 +0900

Stephen Rothwell wrote:
> 
> Hi Dmitry,
> 
> On Thu, 10 Nov 2011 19:41:59 -0800 Dmitry Torokhov
> <[email-masked]> wrote:
> >
> > Please drop the whole HAVE_SAMSUNG_KEYPAD thing; HAVE_CLK is all
> > this driver needs. Expanding beyond Samsung will allow greater
> > compile coverage.
> 
> OK, I have modified the conflict resolution for tomorrow.
> 
OK, I will git-revert it in my tree.

Sorry for late response.
Thanks.

Best regards,
Kgene.
--
Kukjin Kim <[email-masked]>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.