Messages in this thread | | | Date | Tue, 13 Nov 2012 10:48:58 -0800 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the staging tree with the mfd tree |
| |
On Tue, Nov 13, 2012 at 02:50:43PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got conflicts in > drivers/iio/adc/Kconfig and drivers/iio/adc/Makefile between commit > 5e53a69b44e8 ("IIO : ADC: tiadc: Add support of TI's ADC driver") from > the mfd tree and commit 168c9d95a940 ("iio:adc:max1363 move from > staging") from the staging tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required).
Looks fine to me, thanks.
greg k-h
| |