]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 20 Aug 2012 02:39:28 +0000 (12:39 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 20 Aug 2012 02:39:28 +0000 (12:39 +1000)
1  2 
drivers/hwmon/coretemp.c
drivers/hwmon/via-cputemp.c

Simple merge
Simple merge