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)
commitdbdf6ff51e3ce13ade5834b0d7d451522fcdb478
treeb5594d70cf4d484101891adbfc01798c14827fa8
parent391e3903e63781debc52a0de73f2e922dcc3f602
parent9ffe29d780dd5f9c662f2c32f8dc64435da726bf
Merge branch 'clk-next-unregister' into clk-next

Conflicts:
drivers/clk/clk.c
drivers/clk/clk.c
include/linux/clk-private.h