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
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
