From: Tony Lindgren Date: Mon, 26 Nov 2012 21:57:12 +0000 (-0800) Subject: Merge tag 'omap-for-v3.8/devel-prcm-signed' into omap-for-v3.8/tmp-merge X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98f7040d822b609c9782f5b017d4c9b688525a33;p=pandora-kernel.git Merge tag 'omap-for-v3.8/devel-prcm-signed' into omap-for-v3.8/tmp-merge omap prcm changes via Paul Walmsley : Some miscellaneous OMAP hwmod changes for 3.8, along with a PRM change needed for one of the hwmod patches to function. Basic test logs for this branch on top of Tony's omap-for-v3.8/clock branch at commit 558a0780b0a04862a678f7823215424b4e5501f9 are here: http://www.pwsan.com/omap/testlogs/hwmod_devel_a_3.8/20121121161522/ However, omap-for-v3.8/clock at 558a0780 does not include some fixes that are needed for a successful test. With several reverts, fixes, and workarounds applied, the following test logs were obtained: http://www.pwsan.com/omap/testlogs/TEST_hwmod_devel_a_3.8/20121121162719/ which indicate that the series tests cleanly. Conflicts: arch/arm/mach-omap2/io.c --- 98f7040d822b609c9782f5b017d4c9b688525a33 Reading git-diff-tree failed