Messages in this thread | | | Date | Tue, 11 Dec 2012 09:24:58 -0800 | From | Greg KH <> | Subject | Re: 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
| |