From: Tony Lindgren <tony@atomide.com>
Date: Mon, 29 Sep 2014 18:18:07 +0000 (-0700)
Subject: Merge tag 'soc-for-v3.18' into omap-for-v3.18/tmp-merge-2014-09-29
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf762e54aefe506f185503ee775cf24c7ddb0b12;p=pandora-kernel.git

Merge tag 'soc-for-v3.18' into omap-for-v3.18/tmp-merge-2014-09-29

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.

Conflicts:
	arch/arm/mach-omap2/prm3xxx.c
---

cf762e54aefe506f185503ee775cf24c7ddb0b12
Reading git-diff-tree failed