From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 16 Sep 2015 15:49:41 +0000 (-0700)
Subject: Merge tag 'hwmon-for-linus-v4.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: firefly_0821_release~176^2~1054
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=30255100d7c253c82b596a0768235d5865eee2cf;p=firefly-linux-kernel-4.4.55.git

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

Pull hwmon fixes from Guenter Roeck:
 "Two patches for the nct6775 driver: add support for NCT6793D, and fix
  swapped registers"

* tag 'hwmon-for-linus-v4.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (nct6775) Add support for NCT6793D
  hwmon: (nct6775) Swap STEP_UP_TIME and STEP_DOWN_TIME registers for most chips
---

30255100d7c253c82b596a0768235d5865eee2cf