From: Tony Lindgren Date: Thu, 18 Sep 2014 17:20:09 +0000 (-0700) Subject: Merge tag 'soc-for-v3.18' into omap-for-v3.18/tmp-merge X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0451cb96885e8f56c1bd0587e59a692e7bfe138;p=pandora-kernel.git Merge tag 'soc-for-v3.18' into omap-for-v3.18/tmp-merge SoC related changes for omaps for v3.18 merge window: - PM changes to make the code easier to use on newer SoCs - PM changes for newer SoCs suspend and resume and wake-up events - Minor clean-up to remove dead Kconfig options Note that these have a dependency to the fixes-v3.18-not-urgent tag and is based on a commit in that series. --- c0451cb96885e8f56c1bd0587e59a692e7bfe138 Reading git-diff-tree failed