Merge remote-tracking branch 'master' into m_master
* master: (38 commits)
target: msm8952: Add display support for MSM8952 Polaris target
platform: msm_shared: Fix scm init and scm_io_read
include: stdlib: Fix the STACK_BUF_ALIGN macro
platform : msm_shared: updated Qusb sequence
dev: gcdb: update panel on sequence of hx8399a
dev: pmi8994: Update vbat calculation
target: mdm9640: Fix the len calculation for ext4 cmdline
target: mdmfermium: add support for volume down key events
target: mdmfermium: correct the reboot reason type
target: msm8952: reset pmi on reboot
platform: msm_shared: Update clock & usb phy driver
platform/target: mdm9640: Add support for mdmcalifornium
project: msm8996: Enable power on vibrator
target: msm8996: Add power on vibrator
platform: msm8996: Add SPMI address for pmi8994
msm_shared: Add shutdown detect compilation for MSM8996
platform: msm_shared: optimize long press power on feature
target: msm8996: Add long press power on
target: msm8996: add PMI_CONFIGURED for 8996
platform: mdmfermium: Add uart and usb clock code
...
Conflicts:
app/aboot/aboot.c
include/platform.h
platform/msm_shared/boot_verifier.c
platform/msm_shared/mmc_sdhci.c
platform/msm_shared/qusb2_phy.c
platform/msm_shared/reboot.c
platform/msm_shared/scm.c
project/msm8996.mk
target/msm8952/rules.mk
Change-Id: I6536221fba9256a58ba301ddc77a1b979aa1eba1