Merge branch 'jdelvare-hwmon/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 00:36:57 +0000 (11:36 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 00:36:57 +0000 (11:36 +1100)

Trivial merge