Merge tag 'omap-devel-e-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git... omap-devel-am33xx-data-for-v3.6
authorTony Lindgren <tony@atomide.com>
Thu, 5 Jul 2012 15:18:04 +0000 (08:18 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 5 Jul 2012 15:18:04 +0000 (08:18 -0700)
OMAP AM33xx clock data

Conflicts:
arch/arm/mach-omap2/Makefile


Trivial merge