tree c304183b6ec95c0c2b9901980984d929171732f5
parent a7cd4b08d9854bcf813fd6906ec3e97073b9bb19
parent 34617e2a4d331fdd8172077d8c70a0421fc136e6
parent 7e69ed974259b42c4f87a44222415dbb7472898d
parent 571078aa3485073964b611493eee480b5dc3c084
parent 476e5be710bec3d324d9a28cf1f4fd15bd358a86
parent 8f0d69dedcf1d10f9f72845f17f9a09a6ef0d66c
author Paul Walmsley <paul@pwsan.com> 1310264647 -0600
committer Paul Walmsley <paul@pwsan.com> 1310264647 -0600

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