]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'jdelvare-hwmon/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 8 Jan 2014 00:34:47 +0000 (11:34 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 8 Jan 2014 00:34:47 +0000 (11:34 +1100)

Trivial merge