]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'jdelvare-hwmon/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 6 Jan 2014 01:39:26 +0000 (12:39 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 6 Jan 2014 01:39:26 +0000 (12:39 +1100)

Trivial merge