Merge branch 'cpufreq-macros' into pm-cpufreq
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 30 Apr 2014 22:50:47 +0000 (00:50 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 30 Apr 2014 22:50:47 +0000 (00:50 +0200)
commit89d4f82aa5ccf08dc28dc8b463844e6d7eed591b
tree91e7e6ff2c5eda51bb48528244387f32c000433e
parent6712d2931933ada259b82f06c03a855b19937074
parent4229e1c61a4a7ac21d5d0790f6add1c9b98d33e7
Merge branch 'cpufreq-macros' into pm-cpufreq
drivers/cpufreq/longhaul.c
drivers/cpufreq/powernow-k6.c