Merge "msm: pm-8x60: Fix suspend time tracking"
Conflicts:
	arch/arm/mach-msm/pm-8x60.c

Signed-off-by: helicopter88 <helicopter88@debian.debian>
Merge "clocksource: arm_arch_timer: Use clocksource for suspend timekeeping"
Merge "timekeeping: utilize the suspend-nonstop clocksource to count suspended time"
clocksource: Add new feature flag CLOCK_SOURCE_SUSPEND_NONSTOP

Some x86 processors have a TSC clocksource, which continues to run
even when system is suspended. Also most OMAP platforms have a
32 KHz timer which has similar capability. Add a feature flag so that
it could be utilized.

CRs-fixed: 536881
Change-Id: I863678fec5a3021158240f2c5b144c552ba0b16a
Signed-off-by: Feng Tang <feng.tang@intel.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Git-commit: 5caf4636259ae3af0efbb9bfc4cd97874b547c7d
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
msm: Modify functional mode of suspened GPIO

Modify functional mode of suspended
GPIO configuration of SPI to GPIO mode
instead of FUNC2 mode. Observed leakage
current issue during boot up when the
functional mode of the GPIO is FUNC2.
Hence,it is changed to GPIO mode in
this patch.

CRs-Fixed: 545555
Change-Id: Ida766a16fb1e25ebedb7dcbf17dfc81f5dbb6f0b
Signed-off-by: Sana Venkat Raju <c_vsana@codeaurora.org>

Conflicts:
	arch/arm/mach-msm/board-8610-gpiomux.c

Signed-off-by: helicopter88 <helicopter88@debian.debian>
Revert "Merge "msm: pm-8x60: Fix suspend time tracking""

This reverts commit 5daa83ba2a3a7c1d2569bab75bb4dee16697a172.
base: sync: import from caf kk 3.10

Signed-off-by: helicopter88 <helicopter88@debian.debian>