From: Mike Turquette <mturquette@linaro.org>
Date: Tue, 31 Dec 2013 19:35:12 +0000 (-0800)
Subject: Merge branch 'clk-next-unregister' into clk-next
X-Git-Tag: v3.14-rc1~109^2~27
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbdf6ff51e3ce13ade5834b0d7d451522fcdb478;p=pandora-kernel.git

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

Conflicts:
	drivers/clk/clk.c
---

dbdf6ff51e3ce13ade5834b0d7d451522fcdb478
Reading git-diff-tree failed