Merge tag 'v3.20-rockchip-dts1' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Fri, 23 Jan 2015 22:06:25 +0000 (14:06 -0800)
committerOlof Johansson <olof@lixom.net>
Fri, 23 Jan 2015 22:06:25 +0000 (14:06 -0800)
commit8739f728dba738f1d6f0da2d3d19cf92ed4b7e32
treefa0ceb54e25fd11c4d65b86201d45b535657f75b
parent68f173f515bb8153c170eff691ae0ed3a2235709
parent5963e106df7b601a8f23cbbaac1420e4c740ada6
Merge tag 'v3.20-rockchip-dts1' of git://git./linux/kernel/git/mmind/linux-rockchip into next/dt

Merge "ARM: rockchip: soc updates for 3.20" [sic!] from Heiko Stübner:

dts part of core suspend support and limiting of rk3288
sd-card clockspeed to 150mhz

* tag 'v3.20-rockchip-dts1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: add suspend settings for rk3288-evb-rk808
  ARM: dts: rockchip: add RK3288 suspend support
  ARM: dts: rockchip: set dw_mmc max-freq 150Mhz

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