lkml.org 
[lkml]   [2009]   [Sep]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-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]
\
 
 \ /
  Last update: 2009-09-23 03:45    [W:0.042 / U:0.192 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site