Hi Jean, Greg,

Today's linux-next merge of the i2c tree got a conflict in
include/linux/i2c.h between commit
e38c93bf253cb3176478a1943cd2306e8413d2bb ("driver core: remove
KOBJ_NAME_LEN define") from the driver-core tree and commit
f625810ef235a8b238427df3129792f89187c085 ("i2c: Kill the old driver
matching scheme") from the i2c tree.  The former changes the definition
of driver_name in two places, the letter removes the definitions.  I went
with the latter.

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