Merge "mmc: core: run clock scaling only in valid card state"
Merge "mmc: core: Log MMC clock frequency transitions"
Merge "mmc: core: Add support for notifying host driver while scaling clocks"
Merge "mmc: msm_sdcc: Add support for dynamic bus clock vote"
Revert "arm: mm: Add VM_ARM_EMPTY_MAPPING flag to mark the PMD gaps"

This reverts commit 04f9c71592609622de5beb0e4dbf3a65de95be34.
msm: kgsl: Don't access context memory after it's freed

Context memory was potentially accessed after being freed. Fix this
by incrementing the context's refcount at strategic places.

Change-Id: I31049bdd3eb9ac52160ca593619fcc8a32d4ddee
Signed-off-by: Lynus Vaz <lvaz@codeaurora.org>
msm: 8960: Track all reservations for memory map

Generate memory map for each reservations for 8960,
8930 and 8064.
Change-Id: I9d5bc8174160ffa410062282f76b15b671219576
Signed-off-by: Chitti Babu Theegala <ctheegal@codeaurora.org>
Revert "Revert "arm: mm: Add VM_ARM_EMPTY_MAPPING flag to mark the PMD gaps""

This reverts commit 9834b4d5207ee13536bc41f3a9d98702c0cd9c7a.
Revert "ARM: 7527/1: uaccess: explicitly check __user pointer when !CPU_USE_DOMAINS"

This reverts commit 8cc876def310b034ab0e0775a14d1a49472d7f5f.
Merge "ion: Update ION_SECURE and ION_FORCE_CONTIGUOUS flags"
Merge "gpu: ion: enable the kmalloc heap"
power: pm8921-bms: fix SOC jumps while entering suspend/resume

The last_soc is being set to -EINVAL when entering suspend. This
causes SOC to jump while coming out of resume.

Instead remember
If we are reporting for the first time after suspend.
The calculated_soc at the time we went to suspend.

Soc should not increase because we cannot suspend while
charging. If the calculated_soc has increased continue reporting
the lower last_soc.

If the calculated soc has dropped check if it has dropped since
suspend. If so decrease the reported soc by the amount it dropped
since suspend.

If the calculated soc has dropped but it has increased since suspend
continue to report the last_soc.

Change-Id: I9040feceaa3e829d11bec0b21e61951f2ed1180b
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
Signed-off-by: Xiaozhe Shi <xiaozhes@codeaurora.org>