From: Kukjin Kim <kgene.kim@samsung•com>
To: 'Stephen Rothwell' <sfr@canb•auug.org.au>,
'Dmitry Torokhov' <dmitry.torokhov@gmail•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
'Thomas Abraham' <thomas.abraham@linaro•org>
Subject: RE: linux-next: manual merge of the input tree with the s5p tree
Date: Tue, 15 Nov 2011 16:26:21 +0900 [thread overview]
Message-ID: <004501cca367$dfbbd650$9f3382f0$%kim@samsung.com> (raw)
In-Reply-To: <20111111165741.5a6d5f14ad70f98776d3b39a@canb.auug.org.au>
Stephen Rothwell wrote:
>
> Hi Dmitry,
>
> On Thu, 10 Nov 2011 19:41:59 -0800 Dmitry Torokhov
> <dmitry.torokhov@gmail•com> 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@samsung•com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
next prev parent reply other threads:[~2011-11-15 7:26 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-11 2:11 linux-next: manual merge of the input tree with the s5p tree Stephen Rothwell
2011-11-11 3:41 ` Dmitry Torokhov
2011-11-11 5:57 ` Stephen Rothwell
2011-11-15 7:26 ` Kukjin Kim [this message]
2011-11-11 8:40 ` Thomas Abraham
-- strict thread matches above, loose matches on Subject: below --
2011-11-11 2:11 Stephen Rothwell
2011-11-11 3:42 ` Dmitry Torokhov
2010-07-22 1:46 Stephen Rothwell
2010-08-06 0:24 ` Stephen Rothwell
2010-08-06 0:43 ` Kukjin Kim
2010-08-06 1:43 ` Stephen Rothwell
2010-08-06 3:20 ` Joonyoung Shim
2010-08-06 5:15 ` Kukjin Kim
2010-08-06 4:33 ` Kukjin Kim
2010-08-06 5:17 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='004501cca367$dfbbd650$9f3382f0$%kim@samsung.com' \
--to=kgene.kim@samsung$(echo .)com \
--cc=dmitry.torokhov@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=thomas.abraham@linaro$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox