diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-16 08:49:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-16 08:49:41 -0700 |
| commit | 30255100d7c253c82b596a0768235d5865eee2cf (patch) | |
| tree | 982c77473b182642f4dc6ea5b84e20998e9b9d56 /drivers/infiniband/hw/ehca | |
| parent | 9efeaaf9a0c1a27c2be8b2d37c73142555702a4f (diff) | |
| parent | cd1faefa66425c3fa338777773c5c017edea3439 (diff) | |
| download | linux-30255100d7c253c82b596a0768235d5865eee2cf.tar.bz2 | |
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
Diffstat (limited to 'drivers/infiniband/hw/ehca')
0 files changed, 0 insertions, 0 deletions