Hi Jean, Today's linux-next merge of the jdelvare-hwmon tree got a conflict in drivers/hwmon/lm90.c between commits from Linus' tree and commits from the jdelvare-hwmon tree. It looks like the jdelvare-hwmon patch series has been reset back (unintentionally?) to stuff that has already been merged into Linus' tree ... so I just used the version from Linus' tree. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpb6uAve49G7.pgp
Description: PGP signature
