]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'quilt/jdelvare-hwmon'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 24 Aug 2012 01:00:00 +0000 (11:00 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 24 Aug 2012 01:00:00 +0000 (11:00 +1000)
1  2 
drivers/hwmon/coretemp.c

Simple merge