lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into for-next

Browse Source 
Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.
This commit is contained in:
Jiri Kosina
2011-04-26 10:22:15 +02:00
parent 9d5e6bdb30 cd2e49e90f
commit 07f9479a40
6039 changed files with 191812 additions and 82206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.c
View File

@@ -46,7 +46,7 @@ int cpu = -1;
*
* performance
* Performance is paramount.
* Unwilling to sacrafice any performance
* Unwilling to sacrifice any performance
* for the sake of energy saving. (hardware default)
*
* normal