Merge tag 'sunxi-clocks-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git...

Allwinner Clocks Additions for 3.18

The most important part of this serie is the addition of the phase API to
handle the MMC clocks in the Allwinner SoCs.

Apart from that, the A23 gained a new mbus driver, and there's a fix for a
incorrect divider table on the APB0 clock.

diff --cc drivers/clk/clk.c
Simple merge

diff --cc include/linux/clk-private.h
index 4ed3410,845be30..0ca5f60
--- 1/include/linux/clk-private.h
--- 2/include/linux/clk-private.h
+++ b/include/linux/clk-private.h
@@@ -46,9 -46,9 +46,10 @@@ struct clk 
        unsigned int            enable_count;
        unsigned int            prepare_count;
        unsigned long           accuracy;
+       int                     phase;
        struct hlist_head       children;
        struct hlist_node       child_node;
 +      struct hlist_node       debug_node;
        unsigned int            notifier_count;
  #ifdef CONFIG_DEBUG_FS
        struct dentry           *dentry;

diff --cc include/linux/clk-provider.h
Simple merge