From: Michael Turquette <mturquette@linaro.org>
Date: Wed, 3 Jun 2015 22:22:03 +0000 (-0700)
Subject: Merge branch 'clk-next-hi6220' into clk-next
X-Git-Tag: omap-for-v4.3/legacy-v2-signed~79^2~18^2~24
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae8d4048fada71a77144e0f05e8612f90b9501f0;p=pandora-kernel.git

Merge branch 'clk-next-hi6220' into clk-next

Conflicts:
	drivers/clk/Kconfig
---

ae8d4048fada71a77144e0f05e8612f90b9501f0
Reading git-diff-tree failed