Hi Jean,

Today's linux-next merge of the i2c tree got a trivial conflict in
drivers/i2c/busses/i2c-nforce2.c because "i2c-nforce2: Disable the second
SMBus channel on the DFI Lanparty NF4 Expert" appeasr in both the i2c
tree and Linus' tree.  I assume that this will go away tomorrow when the
i2c tree gets resynced.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/