diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-04-03 11:07:29 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-04-03 11:07:29 -0400 |
| commit | efc33ce197e4b6aaddf1eb2ba6293f51daf3c283 (patch) | |
| tree | 9eaceed3c855d5cbc91c2fc247bdcceafbf28cdf /Documentation/hwmon/max16064 | |
| parent | 993884f6a26c6547fa3875f9d3fabdc4250d8da6 (diff) | |
| parent | 690a863ff03d9a29ace2b752b8f802fba78a842f (diff) | |
Merge branch 'for-linus' into for-next
Back-merge for cleaning up usb-audio code the recent commit modified,
and further UAC2 autoclock patches.
Diffstat (limited to 'Documentation/hwmon/max16064')
| -rw-r--r-- | Documentation/hwmon/max16064 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/hwmon/max16064 b/Documentation/hwmon/max16064 index f8b478076f6d..d59cc7829bec 100644 --- a/Documentation/hwmon/max16064 +++ b/Documentation/hwmon/max16064 | |||
| @@ -7,7 +7,7 @@ Supported chips: | |||
| 7 | Addresses scanned: - | 7 | Addresses scanned: - |
| 8 | Datasheet: http://datasheets.maxim-ic.com/en/ds/MAX16064.pdf | 8 | Datasheet: http://datasheets.maxim-ic.com/en/ds/MAX16064.pdf |
| 9 | 9 | ||
| 10 | Author: Guenter Roeck <guenter.roeck@ericsson.com> | 10 | Author: Guenter Roeck <linux@roeck-us.net> |
| 11 | 11 | ||
| 12 | 12 | ||
| 13 | Description | 13 | Description |