Re: linux-next: manual merge of the gpio-lw tree with the driver-core tree

2012-12-11 Thread Greg KH
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: > P

linux-next: manual merge of the gpio-lw tree with the driver-core tree

2012-12-10 Thread Stephen Rothwell
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.