diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b /drivers/cpufreq/cpufreq.c | |
| parent | f030d60b30855e18ac5bf080fa9e576147623d18 (diff) | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 (diff) | |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.c
Diffstat (limited to 'drivers/cpufreq/cpufreq.c')
| -rw-r--r-- | drivers/cpufreq/cpufreq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index b03771d4787c..2dafc5c38ae7 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c | |||
| @@ -1782,7 +1782,7 @@ error_out: | |||
| 1782 | * cpufreq_update_policy - re-evaluate an existing cpufreq policy | 1782 | * cpufreq_update_policy - re-evaluate an existing cpufreq policy |
| 1783 | * @cpu: CPU which shall be re-evaluated | 1783 | * @cpu: CPU which shall be re-evaluated |
| 1784 | * | 1784 | * |
| 1785 | * Usefull for policy notifiers which have different necessities | 1785 | * Useful for policy notifiers which have different necessities |
| 1786 | * at different times. | 1786 | * at different times. |
| 1787 | */ | 1787 | */ |
| 1788 | int cpufreq_update_policy(unsigned int cpu) | 1788 | int cpufreq_update_policy(unsigned int cpu) |