From: Tony Lindgren <tony@atomide.com>
Date: Fri, 21 Sep 2012 21:18:57 +0000 (-0700)
Subject: Merge branch 'devel-clock' into tmp-merge
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f08f0d407e5369fe555b481dde75b6e0a22a52e;p=pandora-kernel.git

Merge branch 'devel-clock' into tmp-merge

Conflicts:
	arch/arm/mach-omap2/clkt34xx_dpll3m2.c
	arch/arm/mach-omap2/clkt_clksel.c
	arch/arm/mach-omap2/clkt_dpll.c
	arch/arm/mach-omap2/clock.c
	drivers/spi/spi-omap2-mcspi.c
---

9f08f0d407e5369fe555b481dde75b6e0a22a52e
Reading git-diff-tree failed