Linux 3.0.60

Conflicts:

	drivers/usb/serial/option.c
Revert "msm: board-8960: Disable idle standalone PC"

This reverts commit 05c962aa7c12b25e68fa97a9b182eadf4cdba275.
msm: pm: backport Retention mode code from 4 to 2 cores
board-m2_vzw: Re-enable idle standalone PC
board-m2_vzw: backport retention mode for 2 cores
board-m2_vzw: add rpmrs level for retention mode
msm: 8960: Set last sleep mode variable for WFI

Set the last sleep mode variable correctly when
entering WFI sleep mode.

Change-Id: I68bbb09b46fe5d7229fbbc67f636294f0d9e92d6
Signed-off-by: Girish Mahadevan <girishm@codeaurora.org>
msm: pm-8x60: Don't restore ACPU frequency for hotplug cases.

During hotplug if power collapse fails don't try to restore the
ACPU clock frequency. For normal hotplug exit ACPU drivers save
and restore as part of hotplug notifications.

CRs-fixed: 334002
Change-Id: I94aee59b7769fb06614d4804797ce62e952437e3
Signed-off-by: Girish Mahadevan <girishm@codeaurora.org>
msm: pm: Support for Krait Retention

Introduce a new low power state for Krait, retention.
This state will lower the voltage to the Krait core to
retention voltage in addition to clock gating. This state
will be in between WFI and Standalone power collapse in
terms of time overhead and power savings.

Change-Id: I6b1f0a0d2e4954a705a047fd4a07f4dd1fb3518a
Signed-off-by: Girish Mahadevan <girishm@codeaurora.org>

Conflicts:

	arch/arm/mach-msm/pm-8x60.c
msm: pm-8x60: Fix bug where device enter low power mode

An incorrect ordering in the check of allowed modes, results in
standalone power collapse not getting selected when the secondary
cores are online.

Change-Id: Idc7177b78bd0ce7563cc27afbf6c12d3bc1f9f9a
Signed-off-by: Mahesh Sivasubramanian <msivasub@codeaurora.org>

Conflicts:

	arch/arm/mach-msm/pm-8x60.c
msm: pm: Add support for retention on each core

Allow each core on 8974 to enter retention and retain
the state of the CPU. On 8960 as hardware restriction does
not permit all cores to enter retention at the same time,
allow only core 0 to enter retention when all other cores
are offline to maintain backward compatibility.

Change-Id: I6690e901afc9fa3a27010c264fa3acc9a0722c1a
Signed-off-by: Priyanka Mathur <pmathur@codeaurora.org>
msm: pm: Remove idle wakelock checking

Now that all users of idle wakelocks are migrated to pm_qos we
can remove the idle wakelock checks from the pm code.

Change-Id: I19cca1d0b28a2943178b9d9eade2b594fd94a139
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>

Conflicts:

	arch/arm/mach-msm/pm-8x60.c
	arch/arm/mach-msm/pm2.c
m2_vzw: (EXP) Update cpuidle state latencies and power
pm: add more debug for pm sleep modes
m2_vzw: Enable Krait Retention
att/spr board: port pm sleep mode tweaks to ATT and SPR
Revert "m2_vzw: (EXP) Update cpuidle state latencies and power"

This reverts commit 25157d8216e2c3e2c73692d65550dbc90294ff87.

This needs more testing - bring it back later possibly.
board-m2-vzw: tweak Retention voltage

Keep stock values (5e96151) but lower Retention voltage
board-m2-att/spr: apply the same two sleep state commits from vzw

commits 092598f & 5e96151
ramdisk: enable Retention sleep mode at boot