diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-10-20 11:07:19 -0400 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-10-20 11:07:19 -0400 |
| commit | 61e0e79ee3c609eb34edf2fe023708cba6a79b1f (patch) | |
| tree | 663deacffd4071120dc9badb70428fe5f124c7b9 /Documentation/hwmon/pc87427 | |
| parent | c15895ef30c2c03e99802951787183039a349d32 (diff) | |
| parent | 0cfd81031a26717fe14380d18275f8e217571615 (diff) | |
Merge branch 'master' into for-upstream
Conflicts:
Documentation/ABI/testing/sysfs-bus-usb
drivers/Makefile
Diffstat (limited to 'Documentation/hwmon/pc87427')
| -rw-r--r-- | Documentation/hwmon/pc87427 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/hwmon/pc87427 b/Documentation/hwmon/pc87427 index 9a0708f9f49e..d1ebbe510f35 100644 --- a/Documentation/hwmon/pc87427 +++ b/Documentation/hwmon/pc87427 | |||
| @@ -5,7 +5,7 @@ Supported chips: | |||
| 5 | * National Semiconductor PC87427 | 5 | * National Semiconductor PC87427 |
| 6 | Prefix: 'pc87427' | 6 | Prefix: 'pc87427' |
| 7 | Addresses scanned: none, address read from Super I/O config space | 7 | Addresses scanned: none, address read from Super I/O config space |
| 8 | Datasheet: http://www.winbond.com.tw/E-WINBONDHTM/partner/apc_007.html | 8 | Datasheet: No longer available |
| 9 | 9 | ||
| 10 | Author: Jean Delvare <khali@linux-fr.org> | 10 | Author: Jean Delvare <khali@linux-fr.org> |
| 11 | 11 | ||