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

Trivial merge