| commit | 30255100d7c253c82b596a0768235d5865eee2cf | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Sep 16 08:49:41 2015 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Sep 16 08:49:41 2015 -0700 |
| tree | 982c77473b182642f4dc6ea5b84e20998e9b9d56 | |
| parent | 9efeaaf9a0c1a27c2be8b2d37c73142555702a4f [diff] | |
| parent | cd1faefa66425c3fa338777773c5c017edea3439 [diff] |
Merge tag 'hwmon-for-linus-v4.3-rc2' of git://git.kernel.org/pub/scm/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