From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Thu, 19 Mar 2009 12:39:58 +0000 (+0000)
Subject: Merge branch 'omap-clks3' into devel
X-Git-Tag: v2.6.30-rc1~636^2~20
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14b6848bc0134b8838d374c423df3edda9b1490e;p=pandora-kernel.git

Merge branch 'omap-clks3' into devel

Conflicts:

	arch/arm/mach-omap2/clock.c
---

14b6848bc0134b8838d374c423df3edda9b1490e
Reading git-diff-tree failed