diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-02 19:56:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-02 19:56:39 -0400 |
| commit | a315b5a6d40bac87c7878bef65291ecbf853546a (patch) | |
| tree | 9c1db4ff5976b90fa3e8a517041b854d7d6512c7 | |
| parent | 74fb838cd4914849d9175c8bf03c91673f3f8d25 (diff) | |
| parent | 29c4bcddaa62e2b9fd2ba85668f6718b0b43f0e3 (diff) | |
Merge tag 'pm-for-3.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management update from Rafael J. Wysocki:
"Change the email address of the powernow-k8 maintainer."
* tag 'pm-for-3.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
cpufreq / powernow-k8: Change maintainer's email address
| -rw-r--r-- | drivers/cpufreq/powernow-k8.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpufreq/powernow-k8.c b/drivers/cpufreq/powernow-k8.c index c16a3a593ba4..e3ebb4fa2c3e 100644 --- a/drivers/cpufreq/powernow-k8.c +++ b/drivers/cpufreq/powernow-k8.c | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | * http://www.gnu.org/licenses/gpl.html | 5 | * http://www.gnu.org/licenses/gpl.html |
| 6 | * | 6 | * |
| 7 | * Maintainer: | 7 | * Maintainer: |
| 8 | * Andreas Herrmann <andreas.herrmann3@amd.com> | 8 | * Andreas Herrmann <herrmann.der.user@googlemail.com> |
| 9 | * | 9 | * |
| 10 | * Based on the powernow-k7.c module written by Dave Jones. | 10 | * Based on the powernow-k7.c module written by Dave Jones. |
| 11 | * (C) 2003 Dave Jones on behalf of SuSE Labs | 11 | * (C) 2003 Dave Jones on behalf of SuSE Labs |