diff options
| author | Paul Walmsley <paul@pwsan.com> | 2012-06-28 08:13:19 +0200 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2012-06-28 08:13:19 +0200 |
| commit | a77e1c4d09c88f98ac2e653382d2c1861dbb736f (patch) | |
| tree | 90eafc878fe3b8b3abfe50ec009defc9935c53ae /arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | |
| parent | ARM: OMAP: AM35xx: fix UART4 softreset (diff) | |
| parent | ARM: OMAP AM35x: EMAC/MDIO integration: Add Davinci EMAC/MDIO hwmod support (diff) | |
| parent | arm: omap3: am35x: Set proper powerdomain states (diff) | |
| download | linux-a77e1c4d09c88f98ac2e653382d2c1861dbb736f.tar.xz linux-a77e1c4d09c88f98ac2e653382d2c1861dbb736f.zip | |
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