[lkml]   [2011]   [Nov]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the staging tree with the driver-core tree
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

 \ /
  Last update: 2011-11-28 06:19    [from the cache]
©2003-2011 Jasper Spaans