]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'jdelvare-hwmon/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 20 Dec 2013 00:45:15 +0000 (11:45 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 20 Dec 2013 00:45:15 +0000 (11:45 +1100)

Trivial merge