Merge branches 'am35xx_hwmod_data_fixes_a_3.6', 'am35xx_emac_mdio_devel_3.6' and...
authorPaul Walmsley <paul@pwsan.com>
Thu, 28 Jun 2012 06:13:19 +0000 (00:13 -0600)
committerPaul Walmsley <paul@pwsan.com>
Thu, 28 Jun 2012 06:13:19 +0000 (00:13 -0600)
commita77e1c4d09c88f98ac2e653382d2c1861dbb736f
tree90eafc878fe3b8b3abfe50ec009defc9935c53ae
parent82ee620dc6e1906fe064e93047489f0aea72b75b
parent31ba88083fec3b141fc1863a2dc0822c474a89a2
parentff7ad7e492b13d4063313f4aace18ced0de8edb4
Merge branches 'am35xx_hwmod_data_fixes_a_3.6', 'am35xx_emac_mdio_devel_3.6' and 'am35xx_prcm_data_devel_3.6' into am35xx_devel_3.6
arch/arm/mach-omap2/clock3xxx_data.c
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c