From: Tony Lindgren <tony@atomide.com>
Date: Thu, 5 Jul 2012 15:18:04 +0000 (-0700)
Subject: Merge tag 'omap-devel-e-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: omap-devel-am33xx-data-for-v3.6^0
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79ab2664336d73245023a236345bb31f2b0a2dfe;p=pandora-kernel.git

Merge tag 'omap-devel-e-for-3.5' of git://git./linux/kernel/git/pjw/omap-pending into devel-am33xx-data

OMAP AM33xx clock data

Conflicts:
	arch/arm/mach-omap2/Makefile
---

79ab2664336d73245023a236345bb31f2b0a2dfe
Reading git-diff-tree failed