Merge remote-tracking branch 'origin/dev/msm-3.18-drm_kms' into msm-3.18

* origin/dev/msm-3.18-drm_kms:
  drm/msm: add default value for plane enum property
  drm/msm: Eliminate redundant declare in msm_drv.c
  ARM: dts: msm: disable secondary adv7533 on apq8096proAU ADP
  drm/msm: Increase maximum number of GPU commands
  ARM: dts: msm: enable three displays on 8996 auto platforms

Change-Id: Ic545bbd62515667717144d42e2c3849bf6340c53
Signed-off-by: Jin Li <jinl@codeaurora.org>