From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 5 Nov 2015 00:36:57 +0000 (+1100)
Subject: Merge branch 'jdelvare-hwmon/master'
X-Git-Tag: KARO-TXUL-2015-12-04~108
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=48a6d31b1fa08c40b1cbfcc235c2332fa2f9dcf3;hp=-c

Merge branch 'jdelvare-hwmon/master'
---

48a6d31b1fa08c40b1cbfcc235c2332fa2f9dcf3