Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging

Pull hwmon fixes from Jean Delvare.

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  hwmon: (emc6w201) Do not declare enum variable
  hwmon: (w83792d) Update module author
This commit is contained in:
Linus Torvalds 2013-09-07 10:54:19 -07:00
commit 7b4022fa17
4 changed files with 5 additions and 6 deletions

View file

@ -17,7 +17,7 @@ Credits:
Philip Edelbrock <[email protected]>,
and Mark Studebaker <[email protected]>
w83792d.c:
Chunhao Huang <[email protected]>,
Shane Huang (Winbond),
Rudolf Marek <[email protected]>
Additional contributors:

View file

@ -7,8 +7,7 @@ Supported chips:
Addresses scanned: I2C 0x2c - 0x2f
Datasheet: http://www.winbond.com.tw
Author: Chunhao Huang
Contact: DZShen <[email protected]>
Author: Shane Huang (Winbond)
Module Parameters