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

[Stephen Rothwell]

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.

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature