]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'jdelvare-hwmon/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 19 Jul 2013 00:36:43 +0000 (10:36 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 19 Jul 2013 00:36:43 +0000 (10:36 +1000)

Trivial merge