Merge tag 'omap-devel-am33xx-for-v3.7' into test_v3.6-rc6_ocb3.7_cff3.7_odaf3.7
authorPaul Walmsley <paul@pwsan.com>
Sun, 23 Sep 2012 23:16:04 +0000 (17:16 -0600)
committerPaul Walmsley <paul@pwsan.com>
Sun, 23 Sep 2012 23:16:04 +0000 (17:16 -0600)
From Paul Walmsley <paul@pwsan.com>:

AM33xx hwmod data and miscellaneous clock and hwmod fixes.  AM33xx
should now boot on mainline after this is applied, according to
Vaibhav.

1  2 
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/clkt_dpll.c
arch/arm/mach-omap2/clock33xx_data.c
arch/arm/mach-omap2/dpll3xxx.c
arch/arm/mach-omap2/omap_hwmod.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge