]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'pm-cpufreq-next' into linux-next
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 27 May 2014 16:41:30 +0000 (18:41 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 27 May 2014 16:41:30 +0000 (18:41 +0200)
commit0c932c3ecbba60bc5f9e08d579891cdbedfdd1c1
tree974f4c79fa0f6036f2af5e2e817ed7abedb03abf
parentedc6145eb6292abc13be48f6712606222dfe630f
parent1ef546f22f14eea624681aa2793f4f07b051b68d
Merge branch 'pm-cpufreq-next' into linux-next

* pm-cpufreq-next: (27 commits)
  cpufreq: s5pv210: drop check for CONFIG_PM_VERBOSE
  cpufreq: intel_pstate: Remove unused member name of cpudata
  cpufreq: Break out early when frequency equals target_freq
  cpufreq: Tegra: drop wrapper around tegra_update_cpu_speed()
  cpufreq: imx6q: Remove unused include
  cpufreq: imx6q: Drop devm_clk/regulator_get usage
  cpufreq: powernow-k8: Suppress checkpatch warnings
  cpufreq: powernv: make local function static
  cpufreq: Enable big.LITTLE cpufreq driver on arm64
  cpufreq: nforce2: remove DEFINE_PCI_DEVICE_TABLE macro
  intel_pstate: Add CPU IDs for Broadwell processors
  cpufreq: Fix build error on some platforms that use cpufreq_for_each_*
  PM / OPP: Move cpufreq specific OPP functions out of generic OPP library
  PM / OPP: Remove cpufreq wrapper dependency on internal data organization
  cpufreq: Catch double invocations of cpufreq_freq_transition_begin/end
  intel_pstate: Remove sample parameter in intel_pstate_calc_busy
  cpufreq: Kconfig: Fix spelling errors
  cpufreq: Make linux-pm@vger.kernel.org official mailing list
  cpufreq: exynos: Use dev_err/info function instead of pr_err/info
  sh: clk: Use cpufreq_for_each_valid_entry macro for iteration
  ...

Conflicts:
arch/mips/loongson/lemote-2f/clock.c
MAINTAINERS
drivers/base/power/opp.c
drivers/cpufreq/intel_pstate.c
tools/power/cpupower/Makefile