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/max34440 | |
| 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/max34440')
| -rw-r--r-- | Documentation/hwmon/max34440 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/hwmon/max34440 b/Documentation/hwmon/max34440 index 47651ff341ae..37cbf472a19d 100644 --- a/Documentation/hwmon/max34440 +++ b/Documentation/hwmon/max34440 | |||
| @@ -27,7 +27,7 @@ Supported chips: | |||
| 27 | Addresses scanned: - | 27 | Addresses scanned: - |
| 28 | Datasheet: http://datasheets.maximintegrated.com/en/ds/MAX34461.pdf | 28 | Datasheet: http://datasheets.maximintegrated.com/en/ds/MAX34461.pdf |
| 29 | 29 | ||
| 30 | Author: Guenter Roeck <guenter.roeck@ericsson.com> | 30 | Author: Guenter Roeck <linux@roeck-us.net> |
| 31 | 31 | ||
| 32 | 32 | ||
| 33 | Description | 33 | Description |