Merge tag 'sunxi-core-for-3.20' of https://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Tue, 27 Jan 2015 04:23:45 +0000 (20:23 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 27 Jan 2015 04:23:45 +0000 (20:23 -0800)
commit688a4994cc23c5fdab22183d804f8d93a142bca9
treed551552518a34fd09a1b4123ff0b1326fcde74fe
parent02685cd20a6f2b0b92fef749d9b9a6c03631c9c2
parentf91b7c62e0cdb8a1a72b61b16fcd48858a7d9193
Merge tag 'sunxi-core-for-3.20' of https://git./linux/kernel/git/mripard/linux into next/soc

Merge "Allwinner core changes for 3.20" from Maxime Ripard:

  - Support for the A31s
  - Adding support for cpufreq using cpufreq-dt

* tag 'sunxi-core-for-3.20' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  ARM: sunxi: Register cpufreq-dt for sun[45678]i
  ARM: sunxi: Add "allwinner,sun6i-a31s" to mach-sunxi

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