qcom: rpm-smd: Mask the interrupt before sending the sleep set.

Sending a sleep set would cause an SMD interrupt to fire. If the
interrupt was previously affine to a different CPU, it could cause a
premature wakeup of that CPU. Prevent this by masking the interrupt
before sending the sleep set.

Signed-off-by: Mahesh Sivasubramanian <msivasub@codeaurora.org>
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
defconfig: update, disable RPM stats, re-enable other stuff
thermal: remove HTC remnants
wake_gestures: re-enable proximity sensor after phone call end and screen turns off
Merged PM Driver Updates from Aurora 3.5 thanks @neobuddy89 for TIP.

Conflicts:
	arch/arm/mach-msm/msm-pm.c
drivers: cm3629: Update CM3629 sensor driver

* HTC kernel package memul-3.4.0-gf8f27cb

Change-Id: I87fa708a69c06df243b1745f02bed3cd8d262ac6
Revert "Fastcharge for HTC One m8"

This reverts commit 4f521541f7f9266509bf3351f4a4422bcacd59ee.
Revert "Fastcharge - ported to M8 by flar2"

This reverts commit c97e650f3ea0a7fb88bce099e66ed022bb0498a3.

Conflicts:
	arch/arm/mach-msm/Kconfig
msm: Update battery/power drivers

* HTC kernel package memul-3.4.0-g3ea4692

Change-Id: If06b01027bf4f078daf0c998d55f06f968aa5f75
msm: HTC: Add 8226 specific bits

* HTC kernel package memul-3.4.0-g3ea4692

Change-Id: I1d177f95f0878835429d1c04e673250146ececa4

Conflicts:
	arch/arm/mach-msm/Kconfig
msm: HTC: Import Desire 816 board files

* HTC package version: a5ul-3.4.0-g4ff7e8c

Change-Id: I8b4ea9baff503201807c2352b629ee91d66155f4
Signed-off-by: Willi Ye <williye97@gmail.com>

Conflicts:
	arch/arm/mach-msm/Makefile.boot
msm: HTC: Import One Mini 2 board files

* HTC kernel package memul-3.4.0-g3ea4692

Change-Id: I5577e0a94207f223516b0cdc40ab4895d6cc6c32

Conflicts:
	arch/arm/mach-msm/Makefile.boot
ARM: dts: msm: Tune SMP block restriction for 8x26

To maximize availability of pipes for both 1080p and 1200p based
8x26 targets, reduce SMP block restriction from 4 to 3.

Change-Id: Ibb5a9d0016ea0d44b152d9c74d9f3a5cbd2acbd3
Signed-off-by: Mayank Chopra <makchopra@codeaurora.org>
ASoC: msm: Allow DOLBY_DAP to be selected on MSM8226

Change-Id: Ib85d17d76ce39e8e405aa9cf1dd0dc225c183f05
drivers: touchscreen: Update Himax 825xD touchscreen driver

* HTC kernel package memul-3.4.0-gf8f27cb

Change-Id: Ib9a9f34ffc1cea576f508837582f1107c96b908f
defconfigs: remove non-M8 defconfigs

I have no plans to support these devices, only added them to source to be
in line with CM source and in case someone wants to port my kernel, they
can just update the defconfig as I have
ARM: 8011/1: ARM hibernation / suspend-to-disk

Enable hibernation for ARM architectures and provide ARM
architecture specific calls used during hibernation.

The swsusp hibernation framework depends on the
platform first having functional suspend/resume.

Then, in order to enable hibernation on a given platform, a
platform_hibernation_ops structure may need to be registered with
the system in order to save/restore any SoC-specific / cpu specific
state needing (re)init over a suspend-to-disk/resume-from-disk cycle.

For example:

     - "secure" SoCs that have different sets of control registers
       and/or different CR reg access patterns.

     - SoCs with L2 caches as the activation sequence there is
       SoC-dependent; a full off-on cycle for L2 is not done
       by the hibernation support code.

     - SoCs requiring steps on wakeup _before_ the "generic" parts
       done by cpu_suspend / cpu_resume can work correctly.

     - SoCs having persistent state which is maintained during suspend
       and resume, but will be lost during the power off cycle after
       suspend-to-disk.

This is a rebase/rework of Frank Hofmann's v5 hibernation patchset.

Acked-by: Russ Dill <Russ.Dill@ti.com>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Signed-off-by: Sebastian Capella <sebastian.capella@linaro.org>
Acked-by: Pavel Machek <pavel@ucw.cz>
Reviewed-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
[fixed duplicate virt_to_pfn() definition --rmk]
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Conflicts:
	arch/arm/kernel/Makefile
	include/linux/suspend.h
ARM: 8165/1: alignment: don't break misaligned NEON load/store

The alignment fixup incorrectly decodes faulting ARM VLDn/VSTn
instructions (where the optional alignment hint is given but incorrect)
as LDR/STR, leading to register corruption. Detect these and correctly
treat them as unhandled, so that userspace gets the fault it expects.

Reported-by: Simon Hosie <simon.hosie@arm.com>
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
crypto: add crypto_sha256_update function (missed earlier)
defconfig: enable NEON crypto