diff options
| author | Paul Walmsley <paul@pwsan.com> | 2011-07-09 20:24:07 -0600 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2011-07-09 20:24:07 -0600 |
| commit | c402c0d9dfa8d4fb54dd98fc12525f39d0f29bfe (patch) | |
| tree | c304183b6ec95c0c2b9901980984d929171732f5 /arch/arm/mach-omap2/omap_hwmod.c | |
| parent | a7cd4b08d9854bcf813fd6906ec3e97073b9bb19 (diff) | |
| parent | 34617e2a4d331fdd8172077d8c70a0421fc136e6 (diff) | |
| parent | 7e69ed974259b42c4f87a44222415dbb7472898d (diff) | |
| parent | 571078aa3485073964b611493eee480b5dc3c084 (diff) | |
| parent | 476e5be710bec3d324d9a28cf1f4fd15bd358a86 (diff) | |
| parent | 8f0d69dedcf1d10f9f72845f17f9a09a6ef0d66c (diff) | |
| download | linux-c402c0d9dfa8d4fb54dd98fc12525f39d0f29bfe.tar.bz2 | |
Merge branches 'dmtimer_precleanup_3.1', 'hwmod_core_cleanup_a_3.1', 'combine_common_hwmod_3.1', 'omap4_hwmod_data_cleanup_a_3.1', 'clock_cleanup_a_3.1', 'prcm_cleanup_a_3.1', 'omap_pm_cleanup_3.1' and 'omap_device_cleanup_3.1' into prcm-cleanup-3.1