Messages in this thread | | | Date | Fri, 11 Nov 2011 16:57:41 +1100 | From | Stephen Rothwell <> | Subject | Re: linux-next: manual merge of the input tree with the s5p tree |
| |
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.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |