Merge branch 'clk-next-unregister' into clk-next

Conflicts:
	drivers/clk/clk.c

diff --cc drivers/clk/clk.c
index b7f6e99,da7b33e..e3e0327
--- 1/drivers/clk/clk.c
--- 2/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@@ -1861,6 -1794,9 +1881,7 @@@ int __clk_init(struct device *dev, stru
        if (clk->ops->init)
                clk->ops->init(clk->hw);
  
 -      clk_debug_register(clk);
 -
+       kref_init(&clk->ref);
  out:
        clk_prepare_unlock();
  

diff --cc include/linux/clk-private.h
index 5fb086b,72c65e0..efbf70b
--- 1/include/linux/clk-private.h
--- 2/include/linux/clk-private.h
+++ b/include/linux/clk-private.h
@@@ -45,9 -48,10 +49,10 @@@ struct clk 
        struct hlist_head       children;
        struct hlist_node       child_node;
        unsigned int            notifier_count;
 -#ifdef CONFIG_COMMON_CLK_DEBUG
 +#ifdef CONFIG_DEBUG_FS
        struct dentry           *dentry;
  #endif
+       struct kref             ref;
  };
  
  /*