From: Mike Turquette <mturquette@linaro.org>
Date: Wed, 1 Oct 2014 18:19:10 +0000 (-0700)
Subject: Merge tag 'v3.18-rockchip-clk2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~176^2~3030^2~3
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a7979009500df9766ba7d78554a6da9dea18dc26;p=firefly-linux-kernel-4.4.55.git

Merge tag 'v3.18-rockchip-clk2' of git://git./linux/kernel/git/mmind/linux-rockchip into clk-next

Allow parent rate changes for i2s on rk3288
and rockchip as well as s3c24xx restart handlers.
---

a7979009500df9766ba7d78554a6da9dea18dc26