lkml.org 
[lkml]   [2012]   [Dec]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the gpio-lw tree with the driver-core tree
On Tue, Dec 11, 2012 at 03:13:10PM +1100, Stephen Rothwell wrote:
> Hi Linus,
>
> Today's linux-next merge of the gpio-lw tree got a conflict in
> drivers/gpio/gpio-stmpe.c between commit 3836309d9346 ("gpio: remove use
> of __devinit") from the driver-core tree and commit fc13d5a5b17c ("gpio:
> Provide the STMPE GPIO driver with its own IRQ Domain") from the gpio-lw
> tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good to me, thanks.

greg k-h


\
 
 \ /
  Last update: 2012-12-11 19:01    [W:1.133 / U:0.016 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site