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)
commitfdbe0946d4c35d4cc784cfe0a5322708cfb7ade8
treefca3ebcb96916e052b4e569d36900fc6bff2b2d7
parent60a406d1de227037193db6790a1a8650ea51dc93
parent6be264986152c498562f26b15ed73c70aa37ce48
Merge branch 'pm-cpufreq'

* pm-cpufreq:
  cpufreq / intel_pstate: Add kernel command line option disable intel_pstate.
  cpufreq / intel_pstate: Change to disallow module build
Documentation/kernel-parameters.txt