diff options
| author | Paul Walmsley <paul@pwsan.com> | 2012-06-28 00:13:19 -0600 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2012-06-28 00:13:19 -0600 |
| commit | a77e1c4d09c88f98ac2e653382d2c1861dbb736f (patch) | |
| tree | 90eafc878fe3b8b3abfe50ec009defc9935c53ae /arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | |
| parent | 82ee620dc6e1906fe064e93047489f0aea72b75b (diff) | |
| parent | 31ba88083fec3b141fc1863a2dc0822c474a89a2 (diff) | |
| parent | ff7ad7e492b13d4063313f4aace18ced0de8edb4 (diff) | |
| download | blackbird-op-linux-a77e1c4d09c88f98ac2e653382d2c1861dbb736f.tar.gz blackbird-op-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
