From: Michael Turquette <mturquette@linaro.org>
Date: Fri, 30 Jan 2015 18:57:21 +0000 (-0800)
Subject: Merge branch 'clk-omap-legacy' into clk-next
X-Git-Tag: omap-for-v4.1/prcm-dts-mfd-syscon-fix~17^2~13^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe767560523d7556cb11fef466adf4b10141d73b;p=pandora-kernel.git

Merge branch 'clk-omap-legacy' into clk-next

Conflicts:
	arch/arm/mach-omap2/cclock3xxx_data.c
---

fe767560523d7556cb11fef466adf4b10141d73b
Reading git-diff-tree failed