Skip to content
Commit 6ddee424 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge back earlier 'pm-cpufreq' material. 

Conflicts:
	drivers/cpufreq/omap-cpufreq.c
parents e4db1c74 a814613b
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment