diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-11-15 11:41:21 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-11-15 11:41:21 -0500 |
| commit | 8dbd2879e33be37adf40f747a5fb80ef1a6cd150 (patch) | |
| tree | c688d7980be8c1c0dbf5e411caaf2c102120102e /Documentation/hwmon | |
| parent | b770ea523d95837e968d46c7fe09a3f5edd9bb27 (diff) | |
| parent | d308ba50a1234b299a00e63a95e61fdeb2f1a2df (diff) | |
Merge branch 'omap/dt' into next/drivers
Needed for the omap timer changes.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'Documentation/hwmon')
| -rw-r--r-- | Documentation/hwmon/fam15h_power | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/hwmon/fam15h_power b/Documentation/hwmon/fam15h_power index a92918e0bd69..80654813d04a 100644 --- a/Documentation/hwmon/fam15h_power +++ b/Documentation/hwmon/fam15h_power | |||
| @@ -10,7 +10,7 @@ Supported chips: | |||
| 10 | BIOS and Kernel Developer's Guide (BKDG) For AMD Family 15h Processors | 10 | BIOS and Kernel Developer's Guide (BKDG) For AMD Family 15h Processors |
| 11 | (not yet published) | 11 | (not yet published) |
| 12 | 12 | ||
| 13 | Author: Andreas Herrmann <andreas.herrmann3@amd.com> | 13 | Author: Andreas Herrmann <herrmann.der.user@googlemail.com> |
| 14 | 14 | ||
| 15 | Description | 15 | Description |
| 16 | ----------- | 16 | ----------- |