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)
1  2  3 
arch/arm/mach-omap2/clock3xxx_data.c
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c

Simple merge