From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 20 Sep 2013 13:40:41 +0000 (+0200)
Subject: Merge branch 'pm-cpufreq'
X-Git-Tag: v3.12-rc2~7^2
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=d831a00510b9d400bf62464d8b11b158941348e6;p=~andy%2Flinux

Merge branch 'pm-cpufreq'

* pm-cpufreq:
  cpufreq: return EEXIST instead of EBUSY for second registering
  ARM: shmobile: change dev_id to cpu0 while registering cpu clock
  ARM: i.MX: change dev_id to cpu0 while registering cpu clock
  cpufreq: imx6q-cpufreq: assign cpu_dev correctly to cpu0 device
  cpufreq: cpufreq-cpu0: assign cpu_dev correctly to cpu0 device
  cpufreq: unlock correct rwsem while updating policy->cpu
  cpufreq: Clear policy->cpus bits in __cpufreq_remove_dev_finish()
---

d831a00510b9d400bf62464d8b11b158941348e6