Messages in this thread | | | Date | Wed, 28 Nov 2012 21:20:49 -0800 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the driver-core tree with the mfd tree |
| |
On Thu, Nov 29, 2012 at 02:50:39PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > drivers/mfd/da9052-core.c between commit 8bad1abd6303 ("mfd: da9052: > Introduce da9052-irq.c") from the mfd tree and commit a9e9ce4c4167 ("mfd: > remove use of __devinitdata") from the driver-core tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required).
Looks good, thanks.
greg k-h
| |