Merge branch 'pm-cpufreq'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 17 Feb 2013 13:38:13 +0000 (14:38 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 17 Feb 2013 13:38:13 +0000 (14:38 +0100)
* pm-cpufreq:
  cpufreq / intel_pstate: Add kernel command line option disable intel_pstate.
  cpufreq / intel_pstate: Change to disallow module build

1  2 
Documentation/kernel-parameters.txt

Simple merge