]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'jdelvare-hwmon/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 8 Nov 2012 23:01:28 +0000 (10:01 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 8 Nov 2012 23:01:28 +0000 (10:01 +1100)

Trivial merge