Merge branches 'powerdomain_fixes_3.1', 'hardware_workarounds_3.1', 'hwmod_dss_fix_3...
authorPaul Walmsley <paul@pwsan.com>
Sun, 10 Jul 2011 11:44:23 +0000 (05:44 -0600)
committerPaul Walmsley <paul@pwsan.com>
Sun, 10 Jul 2011 11:44:23 +0000 (05:44 -0600)
1  2  3 
arch/arm/mach-omap2/clock44xx_data.c
arch/arm/mach-omap2/powerdomains44xx_data.c

Simple merge