Merge branch 'clk-next-unregister' into clk-next
authorMike Turquette <mturquette@linaro.org>
Tue, 31 Dec 2013 19:35:12 +0000 (11:35 -0800)
committerMike Turquette <mturquette@linaro.org>
Tue, 31 Dec 2013 19:35:12 +0000 (11:35 -0800)
Conflicts:
drivers/clk/clk.c


Trivial merge