]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'pm-cpufreq-next' into linux-next
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 15 Feb 2013 21:56:22 +0000 (22:56 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 15 Feb 2013 21:56:22 +0000 (22:56 +0100)
* pm-cpufreq-next:
  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