tree a7ab5deede87975590f31c3c4c83541f39581f66
parent 3de1c512347e9cdd6f3da1e7d4ef424b7e303d03
parent 53083be115dbef0e5a8df847ec5fdf6bd14628aa
author Channagoud Kadabi <ckadabi@codeaurora.org> 1441739573 -0700
committer Channagoud Kadabi <ckadabi@codeaurora.org> 1441742534 -0700

Merge remote-tracking branch 'master' into mhb

* master: (50 commits)
  dev: gcdb: display: add jdi 4k video nofbc panel support
  dev: gcdb: display: fix pclk calculation
  platform: usb: Configure AHB2 phy wait states
  platform: msm_shared: Add support for MDM californium
  platform: msm_shared: fix DSC cmd mode configuration
  Revert "target: msm8952: support DSC panel selection through fastboot"
  Revert "target: msm8952: update the DSI h/w configuration for DSC panels"
  dev: gcdb: display: update panel lookup table with ADV7533 panels
  dev: gcdb: display: add support to swap DSI lanes to drive a panel
  Revert "target: msm8952: add support for dual DSI configuration for msm8956"
  dev: gcdb: display: handle DSI PLL source selection properly
  target: msm8996: Add display panel support for msm8996 DTP
  target: msm8996: Add R69007 panel file
  dev: pmic: pmi8994: Add prototype to header file
  target: msm8909: change backlight type to DCS for fl10802
  app: recovery: Fix write to misc partition
  platform: msm_shared: Update the reboot reason values for PON
  platform: msm_shared: Enable crypto clocks only once
  app: aboot: Wait for display shutdown to finish
  dev: pmi8994: Add display suspend, resume for charging
  ...

Change-Id: I554626126eec5b8544c843d22a16a3213e520a53