From: Paul Walmsley <paul@pwsan.com>
Date: Sun, 23 Sep 2012 23:27:43 +0000 (-0600)
Subject: Merge branch 'clock_devel_3.7' into hwmod_prcm_clock_a_3.7
X-Git-Tag: omap-devel-late-for-v3.7^2~31
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4fb85d35bcec842e0f20437aea277157973aa45f;p=pandora-kernel.git

Merge branch 'clock_devel_3.7' into hwmod_prcm_clock_a_3.7

Conflicts:
	arch/arm/mach-omap2/clkt34xx_dpll3m2.c
	arch/arm/mach-omap2/clkt_clksel.c
	arch/arm/mach-omap2/clock.c
---

4fb85d35bcec842e0f20437aea277157973aa45f
Reading git-diff-tree failed