diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-29 03:45:15 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-29 03:45:15 -0500 |
| commit | e1df957670aef74ffd9a4ad93e6d2c90bf6b4845 (patch) | |
| tree | bca1fcfef55b3e3e82c9a822b4ac6428fce2b419 /Documentation/cpu-freq | |
| parent | 2b583d8bc8d7105b58d7481a4a0ceb718dac49c6 (diff) | |
| parent | 3c92ec8ae91ecf59d88c798301833d7cf83f2179 (diff) | |
Merge branch 'linus' into perfcounters/core
Conflicts:
fs/exec.c
include/linux/init_task.h
Simple context conflicts.
Diffstat (limited to 'Documentation/cpu-freq')
| -rw-r--r-- | Documentation/cpu-freq/user-guide.txt | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Documentation/cpu-freq/user-guide.txt b/Documentation/cpu-freq/user-guide.txt index 4f3f3840320e..e3443ddcfb89 100644 --- a/Documentation/cpu-freq/user-guide.txt +++ b/Documentation/cpu-freq/user-guide.txt | |||
| @@ -93,10 +93,8 @@ Several "PowerBook" and "iBook2" notebooks are supported. | |||
| 93 | 1.5 SuperH | 93 | 1.5 SuperH |
| 94 | ---------- | 94 | ---------- |
| 95 | 95 | ||
| 96 | The following SuperH processors are supported by cpufreq: | 96 | All SuperH processors supporting rate rounding through the clock |
| 97 | 97 | framework are supported by cpufreq. | |
| 98 | SH-3 | ||
| 99 | SH-4 | ||
| 100 | 98 | ||
| 101 | 1.6 Blackfin | 99 | 1.6 Blackfin |
| 102 | ------------ | 100 | ------------ |