diff options
| author | Len Brown <len.brown@intel.com> | 2010-08-15 01:06:31 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-08-15 01:06:31 -0400 |
| commit | 95ee46aa8698f2000647dfb362400fadbb5807cf (patch) | |
| tree | e5a05c7297f997e191c73091934e42e3195c0e40 /Documentation/hwmon/g760a | |
| parent | cfa806f059801dbe7e435745eb2e187c8bfe1e7f (diff) | |
| parent | 92fa5bd9a946b6e7aab6764e7312e4e3d9bed295 (diff) | |
Merge branch 'linus' into release
Conflicts:
drivers/acpi/debug.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'Documentation/hwmon/g760a')
| -rw-r--r-- | Documentation/hwmon/g760a | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/hwmon/g760a b/Documentation/hwmon/g760a index e032eeb75629..cfc894537061 100644 --- a/Documentation/hwmon/g760a +++ b/Documentation/hwmon/g760a | |||
| @@ -5,7 +5,7 @@ Supported chips: | |||
| 5 | * Global Mixed-mode Technology Inc. G760A | 5 | * Global Mixed-mode Technology Inc. G760A |
| 6 | Prefix: 'g760a' | 6 | Prefix: 'g760a' |
| 7 | Datasheet: Publicly available at the GMT website | 7 | Datasheet: Publicly available at the GMT website |
| 8 | http://www.gmt.com.tw/datasheet/g760a.pdf | 8 | http://www.gmt.com.tw/product/datasheet/EDS-760A.pdf |
| 9 | 9 | ||
| 10 | Author: Herbert Valerio Riedel <hvr@gnu.org> | 10 | Author: Herbert Valerio Riedel <hvr@gnu.org> |
| 11 | 11 | ||