From: Tony Lindgren Date: Tue, 9 Oct 2012 02:52:40 +0000 (-0700) Subject: Merge tags 'omap-for-v3.7-rc1/fixes-signed', 'omap-for-v3.7-rc1/fixes-pm-signed'... X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=215c95f09a9238e87c3ecf3808632163de882a0c;p=pandora-kernel.git Merge tags 'omap-for-v3.7-rc1/fixes-signed', 'omap-for-v3.7-rc1/fixes-pm-signed', 'omap-for-v3.7-rc1/fixes-cpufreq-signed' and 'omap-for-v3.7-rc1/fixes-asoc-regression-signed' into omap-for-v3.7-rc1/tmp-merge This branch contains one counter locking fix and an alignment fix. Other fixes are warning fixes, fixes for return value checks. I've also included removal of some extra semicolons, dropping of some duplicate includes, and an a change for wl12xx enumeration that are not strictly fixes but would be good to get out of the way for -rc1. From Kevin Hilman : OMAP PM related fixes for v3.7-rc These were agreed to be merged via arm soc tree as Rafael is on vacation. From Kevin Hilman : This series a couple bug fixes and a couple fixes that make this driver support recently added OMAP-based SoCs. The 'get_cpu_device' patch is needed due to a change in the OMAP OMAP PM core code which enforces use of get_cpu_device() instead of a deprecated OMAP-specific API. The usage of plat/*.h headers breaks single zImage, so platforms are cleaning up and/or removing plat/*.h so the driver needs to be fixed accordingly. This series is based on the merge of Rafael's pm-for-3.7-rc1 tag into Linus' master branch: commit 16642a2e7be23bbda013fc32d8f6c68982eab603. This branch contains regression fixes for omap4/5 ASoC audio that were caused by the fact that u-boot stopped muxing non essential pins. As omap audio and dmaengine development happens on these platforms, let's make sure they are usable. Of course this should have been fixed earlier and not during the -rc cycle. --- 215c95f09a9238e87c3ecf3808632163de882a0c Reading git-diff-tree failed