Merge tag 'hwmon-for-linus-v3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 23 Oct 2014 20:56:24 +0000 (13:56 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 23 Oct 2014 20:56:24 +0000 (13:56 -0700)
commit5de551e0eeddf470928e9fee59825a3645641bc7
treed795f5003741709f0c218a5cce58ed96853de6f3
parenteb0c5ff6f3f12e717ecb0392b137884e40bb32bd
parent3d5960472de0a245c56ba55e9a59b8d0f4c69cb4
Merge tag 'hwmon-for-linus-v3.18-rc2' of git://git./linux/kernel/git/groeck/linux-staging

Pull a hwmon fix from Guenter Roeck:
 "Fix potential compile problem for menf21bmc hwmon driver"

* tag 'hwmon-for-linus-v3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (menf21bmc) Include linux/err.h