Merge tag 'v3.18-rockchip-cpufreqdev-v2' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Tue, 4 Nov 2014 04:49:01 +0000 (20:49 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 4 Nov 2014 04:49:01 +0000 (20:49 -0800)
commit9576d3e622f325e617b272172dd68e329e742f77
treeefb27fc93d756d17c76f12eccb617149e80d7105
parent0df1f2487d2f0d04703f142813d53615d62a1da4
parent3eb79a5a9d46b32f63f6b9cd86f9b2bba43e127a
Merge tag 'v3.18-rockchip-cpufreqdev-v2' of git://git./linux/kernel/git/mmind/linux-rockchip into next/soc

Merge "ARM: rockchip: cpufreq-cpu0 device" from Heiko Stubner:

Add cpufreq-dt platform device for cpu frequency scaling.

* tag 'v3.18-rockchip-cpufreqdev-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: rockchip: honor renaming of cpufreq-cpu0 to cpufreq-dt
  ARM: rockchip: add a cpufreq-cpu0 device

Signed-off-by: Olof Johansson <olof@lixom.net>