From: Mike Turquette <mturquette@linaro.org>
Date: Wed, 11 Jun 2014 14:11:59 +0000 (-0700)
Subject: Merge tag 'sunxi-clk-for-3.16-2' of https://github.com/mripard/linux into clk-next
X-Git-Tag: v3.16-rc1~2^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=b640a6037c9ecd1f0ad23a8e9b4ca5f5b4112508;p=linux.git

Merge tag 'sunxi-clk-for-3.16-2' of https://github.com/mripard/linux into clk-next

Rebase of Emilio's clk-sunxi-for-3.16 on top of clk-next

Fixed a few compilation warnings exposed by a patch introduced during the 3.16
merge window.

Original tag message:

Allwinner sunXi SoCs clock changes

This pull contains some new code to add support for A31 clocks by Maxime
and Boris. It also reworks the driver a bit to avoid having a huge
single file when we have a full folder for ourselves, and separating
different functional units makes sense.
---

b640a6037c9ecd1f0ad23a8e9b4ca5f5b4112508