Merge branch 'pm-cpufreq'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 8 Apr 2014 11:28:02 +0000 (13:28 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 8 Apr 2014 11:28:02 +0000 (13:28 +0200)
commitfe10739284bae68b57d3dbcad81f34772cfd2716
tree896fa694b7f6a46266ff8eb5291c35781be53e25
parent8c73c4d8319f38ec1a1fc630a88cbcb79cb1a8f6
parentf334a1e8434c49b6f9c947d3eb7caf712fbcc3fa
Merge branch 'pm-cpufreq'

* pm-cpufreq:
  cpufreq: ppc: Remove duplicate inclusion of fsl_soc.h
  cpufreq: create another field .flags in cpufreq_frequency_table
  cpufreq: use kzalloc() to allocate memory for cpufreq_frequency_table
  cpufreq: don't print value of .driver_data from core
  cpufreq: ia64: don't set .driver_data to index
  cpufreq: powernv: Select CPUFreq related Kconfig options for powernv
  cpufreq: powernv: Use cpufreq_frequency_table.driver_data to store pstate ids
  cpufreq: powernv: cpufreq driver for powernv platform
  cpufreq: at32ap: don't declare local variable as static
  cpufreq: loongson2_cpufreq: don't declare local variable as static
  cpufreq: unicore32: fix typo issue for 'clk'
  cpufreq: exynos: Disable on multiplatform build
arch/powerpc/include/asm/reg.h
drivers/cpufreq/Kconfig.arm
drivers/cpufreq/acpi-cpufreq.c