From: Tony Lindgren <tony@atomide.com>
Date: Fri, 10 Apr 2009 19:03:31 +0000 (-0700)
Subject: Merge branch 'omap-clock-fixes' of git://git.pwsan.com/linux-2.6
X-Git-Tag: v2.6.32-omap1~11^2^2~1^2^2^2^2^2~8^2^2~18^2~2^2^2~2^2^2^2^2~16^2^2~8^2^2~7^2~168
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12323321f004c9e83061c9a9d06046b050d6d4c7;p=pandora-kernel.git

Merge branch 'omap-clock-fixes' of git://git.pwsan.com/linux-2.6

Conflicts:
	arch/arm/mach-omap2/board-omap3beagle.c
---

12323321f004c9e83061c9a9d06046b050d6d4c7
Reading git-diff-tree failed