Re: linux-next: manual merge of the staging tree with thedriver-core tree

[Greg KH]

On Mon, Nov 28, 2011 at 03:22:22PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/iio/adc/ad799x_core.c between commit 6e5af184f810
> ("staging:iio: Use module_i2c_driver to register I2C drivers") from the
> tree and commit 55e4390cb04e ("staging:iio: Add missing
> MODULE_DEVICE_TABLE and MODULE_ALIAS") from the staging tree.
> 
> Just context differences.  I fixed it up (see below) and can carry the
> fix as necessary.

Looks great, thanks.

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/