commit | 6ddee424fea2d269c2f402278d93165c7b92dc58 | [log] [tgz] |
---|---|---|
author | Rafael J. Wysocki <rjw@rjwysocki.net> | Fri Oct 25 22:36:40 2013 +0200 |
committer | Rafael J. Wysocki <rjw@rjwysocki.net> | Fri Oct 25 22:36:40 2013 +0200 |
tree | c1b1d0d9058846a6da22def648dea61e16faacd0 | |
parent | e4db1c7439b31993a4886b273bb9235a8eea82bf [diff] | |
parent | a814613b9a32d9ab9578d9dab396265c826d37f0 [diff] |
Merge back earlier 'pm-cpufreq' material. Conflicts: drivers/cpufreq/omap-cpufreq.c