From: Michael Turquette <mturquette@linaro.org>
Date: Wed, 28 Jan 2015 00:26:12 +0000 (-0800)
Subject: Merge tag 'v3.20-rockchip-clk1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b80418f3c05061094c57ad7a661c9fb14e3f8b73;p=linux-beck.git

Merge tag 'v3.20-rockchip-clk1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into clk-next

The two big changes are the additional of the watchdog clock, which
we currently only "fake" as the clock gate control is living in a
very strange place, but the watchdog driver needs to read the clock
rate from it and the setting of rk3288 plls to slow mode upon suspend.

Other than that some more exported clocks and a CLK_SET_RATE_PARENT
flag for the uart clocks.
---

b80418f3c05061094c57ad7a661c9fb14e3f8b73