Re: linux-next: manual merge of the arm-soc tree with the driver-core tree

2012-11-29 Thread Simon Guinot
On Thu, Nov 29, 2012 at 04:03:09PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in > drivers/leds/leds-ns2.c between commit 98ea1ea20cb7 ("leds: remove use of > __devinit") from the driver-core tree and commit 72052fcc1026 ("leds: > leds-

Re: linux-next: manual merge of the arm-soc tree with the driver-core tree

2012-11-28 Thread Greg KH
On Thu, Nov 29, 2012 at 04:03:09PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in > drivers/leds/leds-ns2.c between commit 98ea1ea20cb7 ("leds: remove use of > __devinit") from the driver-core tree and commit 72052fcc1026 ("leds: > leds-

linux-next: manual merge of the arm-soc tree with the driver-core tree

2012-11-28 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm-soc tree got a conflict in drivers/leds/leds-ns2.c between commit 98ea1ea20cb7 ("leds: remove use of __devinit") from the driver-core tree and commit 72052fcc1026 ("leds: leds-ns2: add device tree binding") from the arm-soc tree. I fixed it up (see belo