diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-07-03 14:51:06 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-07-03 14:51:06 +1000 |
| commit | dd453950b674145f26a351f6da7b488c7dc34337 (patch) | |
| tree | c910faf055608cdb7d5a0242602b40ee69eaa303 /arch | |
| parent | 40e0996da3067d4222be9a9b2f4ab6bb10ab2ca5 (diff) | |
| parent | 48adcf148c83faa41999fb0b3524299c4e160fd9 (diff) | |
Merge commit 'cpufreq/next'
Conflicts:
drivers/cpufreq/cpufreq.c
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/cpu/cpufreq/powernow-k7.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k7.h b/arch/x86/kernel/cpu/cpufreq/powernow-k7.h index f8a63b3664e3..35fb4eaf6e1c 100644 --- a/arch/x86/kernel/cpu/cpufreq/powernow-k7.h +++ b/arch/x86/kernel/cpu/cpufreq/powernow-k7.h @@ -1,5 +1,4 @@ /* - * $Id: powernow-k7.h,v 1.2 2003/02/10 18:26:01 davej Exp $ * (C) 2003 Dave Jones. * * Licensed under the terms of the GNU GPL License version 2. |