diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-07 10:54:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-07 10:54:19 -0700 |
| commit | 7b4022fa17991801e29f09c6794bbf4d1a0d6b6d (patch) | |
| tree | 39e1597430fb99407b491c888d6ac6d9fe7fa81c /Documentation/hwmon | |
| parent | 27c7651a6a5f143eccd66db38c7a3035e1f8bcfb (diff) | |
| parent | 94e44413cdda7b1b838a4c508a4eca0cdd5e7a18 (diff) | |
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
Diffstat (limited to 'Documentation/hwmon')
| -rw-r--r-- | Documentation/hwmon/w83791d | 2 | ||||
| -rw-r--r-- | Documentation/hwmon/w83792d | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/Documentation/hwmon/w83791d b/Documentation/hwmon/w83791d index 90387c3540f7..f4021a285460 100644 --- a/Documentation/hwmon/w83791d +++ b/Documentation/hwmon/w83791d @@ -17,7 +17,7 @@ Credits: Philip Edelbrock <phil@netroedge.com>, and Mark Studebaker <mdsxyz123@yahoo.com> w83792d.c: - Chunhao Huang <DZShen@Winbond.com.tw>, + Shane Huang (Winbond), Rudolf Marek <r.marek@assembler.cz> Additional contributors: diff --git a/Documentation/hwmon/w83792d b/Documentation/hwmon/w83792d index 8a023ce0b72e..53f7b6866fec 100644 --- a/Documentation/hwmon/w83792d +++ b/Documentation/hwmon/w83792d @@ -7,8 +7,7 @@ Supported chips: Addresses scanned: I2C 0x2c - 0x2f Datasheet: http://www.winbond.com.tw -Author: Chunhao Huang -Contact: DZShen <DZShen@Winbond.com.tw> +Author: Shane Huang (Winbond) Module Parameters |