Stephen Rothwell wrote: > > Hi Dmitry, > > On Thu, 10 Nov 2011 19:41:59 -0800 Dmitry Torokhov > <dmitry.torokhov@xxxxxxxxx> 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 <kgene.kim@xxxxxxxxxxx>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html