From: Michael Turquette <mturquette@linaro.org>
Date: Sun, 25 Jan 2015 00:58:40 +0000 (-0800)
Subject: Merge branch 'clk-has-parent' into clk-next
X-Git-Tag: v4.0-rc1~16^2~13^2~34
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=57386798f7db7f09d69f3b44fc66570e6db91bba;p=users%2Fdwmw2%2Flinux.git

Merge branch 'clk-has-parent' into clk-next
---

57386798f7db7f09d69f3b44fc66570e6db91bba