diff options
author | Dave Jones <davej@redhat.com> | 2007-02-11 02:36:29 +0100 |
---|---|---|
committer | Dave Jones <davej@redhat.com> | 2007-02-11 02:36:29 +0100 |
commit | bd0561c9d8dcbf21cd9aa46c416bbf6a3a12e4b1 (patch) | |
tree | 64fe15d4db42e0840acea00e4cf7e1855bba9e96 /include/asm-mips/segment.h | |
parent | [CPUFREQ] Longhaul - Separate frequency and voltage transition (diff) | |
parent | libata: kill ATA_ENABLE_PATA (diff) | |
download | linux-bd0561c9d8dcbf21cd9aa46c416bbf6a3a12e4b1.tar.xz linux-bd0561c9d8dcbf21cd9aa46c416bbf6a3a12e4b1.zip |
[CPUFREQ] Fix up merge conflicts with recent ACPI changes.
Signed-off-by: Dave Jones <davej@redhat.com>
Diffstat (limited to 'include/asm-mips/segment.h')
0 files changed, 0 insertions, 0 deletions