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)
commit79ab2664336d73245023a236345bb31f2b0a2dfe
tree16fb7f77074a39b74aecbf324b0b7de2eaf6d094
parentecc46cfdad7499a21296f0757059c4965f1fbc98
parente30384abd63dfa11508a38243e1d78f1d70486b1
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
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/clock33xx_data.c
arch/arm/mach-omap2/clock3xxx_data.c
arch/arm/mach-omap2/clock44xx_data.c