Messages in this thread | | | Date | Wed, 23 Sep 2009 11:42:57 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the jdelvare-hwmon tree with Linus' tree |
| |
Hi Jean,
Today's linux-next merge of the jdelvare-hwmon tree got a conflict in drivers/hwmon/coretemp.c between commit 0bf41d9f414a5cf558aff234a0ff486257537574 ("drivers/hwmon/coretemp.c: enable the Intel Atom") from Linus' tree and commit af663ff4d88e09c4e45661251e3c1eeff147ffc1 ("hwmon: (coretemp) Add support for Atom CPUs") from the jdelvare-hwmon tree.
I used the version from the jdelvare-hwmon for today. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |