From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 23 Oct 2014 20:56:24 +0000 (-0700)
Subject: Merge tag 'hwmon-for-linus-v3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.18-rc2~14
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=5de551e0eeddf470928e9fee59825a3645641bc7;p=~emulex%2Finfiniband.git

Merge tag 'hwmon-for-linus-v3.18-rc2' of git://git.kernel.org/pub/scm/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
---

5de551e0eeddf470928e9fee59825a3645641bc7