Merge tag 'clk-mvebu-3.18-2' of git://git.infradead.org/linux-mvebu into clk-next

author Mike Turquette <mturquette@linaro.org>

Fri, 3 Oct 2014 23:43:02 +0000 (16:43 -0700)

committer Mike Turquette <mturquette@linaro.org>

Fri, 3 Oct 2014 23:43:02 +0000 (16:43 -0700)
author Mike Turquette <mturquette@linaro.org>
Fri, 3 Oct 2014 23:43:02 +0000 (16:43 -0700)
committer Mike Turquette <mturquette@linaro.org>
Fri, 3 Oct 2014 23:43:02 +0000 (16:43 -0700)
diff --cc drivers/clk/mvebu/common.c
Simple merge
diff --cc drivers/clk/mvebu/common.h
Simple merge
author	Mike Turquette <mturquette@linaro.org>
	Fri, 3 Oct 2014 23:43:02 +0000 (16:43 -0700)
committer	Mike Turquette <mturquette@linaro.org>
	Fri, 3 Oct 2014 23:43:02 +0000 (16:43 -0700)
		1	2
drivers/clk/mvebu/common.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/clk/mvebu/common.h	patch \|	diff1 \|	diff2 \|	blob \| history