]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'jdelvare-hwmon/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 01:09:22 +0000 (11:09 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 01:09:22 +0000 (11:09 +1000)

Trivial merge