From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 20 Jun 2016 17:04:12 +0000 (-0700)
Subject: Merge tag 'hwmon-for-linus-v4.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.9.8~1869
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4e183d7add15e8bdd131aa14976e26ca3d71a889;p=platform%2Fkernel%2Flinux-rpi3.git

Merge tag 'hwmon-for-linus-v4.7-rc4' of git://git./linux/kernel/git/groeck/linux-staging

Pull hwmon fixes from Guenter Roeck:
 "Two stability fixes plus a security fix for the dell-smm driver"

* tag 'hwmon-for-linus-v4.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (dell-smm) Disallow fan_type() calls on broken machines
  hwmon: (dell-smm) Restrict fan control and serial number to CAP_SYS_ADMIN by default
  hwmon: (dell-smm) Fail in ioctl I8K_BIOS_VERSION when bios version is not a number
---

4e183d7add15e8bdd131aa14976e26ca3d71a889