From: Paul Walmsley <paul@pwsan.com>
Date: Sun, 10 Jul 2011 02:24:07 +0000 (-0600)
Subject: Merge branches 'dmtimer_precleanup_3.1', 'hwmod_core_cleanup_a_3.1', 'combine_common_... 
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=c402c0d9dfa8d4fb54dd98fc12525f39d0f29bfe;p=linux-edison.git

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
---

c402c0d9dfa8d4fb54dd98fc12525f39d0f29bfe