]> 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>
Wed, 19 Sep 2012 00:57:15 +0000 (10:57 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Sep 2012 00:57:15 +0000 (10:57 +1000)
1  2 
Documentation/feature-removal-schedule.txt
drivers/hwmon/via-cputemp.c

Simple merge