Messages in this thread | | | Date | Mon, 13 Sep 2010 21:09:15 -0700 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the driver-core tree with the mfd tree |
| |
On Tue, Sep 14, 2010 at 12:25:10PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > drivers/misc/Makefile between commit > 03f582a93ecca6e9584b622570022abf08ed03ec ("misc: Add ab8500 pwm driver") > from the mfd tree and commit b6de6c8f5a6fc18c5c67bb4e53f3d0cfd266b07b > ("add Packet hub driver for Topcliff Platform controller hub") from the > driver-core tree. > > Just overlapping additions. I fixed it up (see below) and can carry the > fix as necessary.
Fix looks fine to me, thanks.
greg k-h
| |