Merge tag 'AU_LINUX_ANDROID_LNX.LA.3.5.2.2_RB1.04.04.04.087.032' into HEAD

AU_LINUX_ANDROID_LNX.LA.3.5.2.2_RB1.04.04.04.087.032 based on quic/aosp/LNX.LA.3.5.2.2_rb1

Conflicts:
	drivers/video/msm/mdss/mdss_fb.h

Change-Id: I63c8597689ea831184da10056cb3e32d64b246e4
Merge tag 'AU_LINUX_ANDROID_LNX.LA.3.5.2.2_RB1.04.04.04.087.033' into HEAD

AU_LINUX_ANDROID_LNX.LA.3.5.2.2_RB1.04.04.04.087.033 based on quic/aosp/LNX.LA.3.5.2.2_rb1
Merge tag 'AU_LINUX_ANDROID_LNX.LA.3.5.2.2_RB1.04.04.04.087.034' into HEAD

AU_LINUX_ANDROID_LNX.LA.3.5.2.2_RB1.04.04.04.087.034 based on quic/aosp/LNX.LA.3.5.2.2_rb1

Conflicts:
	drivers/video/msm/mdss/mdss_fb.c
	drivers/video/msm/mdss/mdss_mdp_overlay.c

Change-Id: I2a52653994e501c064bf29638ad8226a65144361
Merge tag 'AU_LINUX_ANDROID_LNX.LA.3.5.2.2_RB1.04.04.04.087.035' into HEAD

AU_LINUX_ANDROID_LNX.LA.3.5.2.2_RB1.04.04.04.087.035 based on quic/aosp/LNX.LA.3.5.2.2_rb1

Conflicts:
	drivers/power/qpnp-charger.c
	drivers/video/msm/mdss/mdss_mdp_overlay.c

Change-Id: Ibc8159ad482ae48be389b7022eea2f4f953f9768
Merge tag 'AU_LINUX_ANDROID_LNX.LA.3.5.2.2_RB1.04.04.04.087.036' into HEAD

AU_LINUX_ANDROID_LNX.LA.3.5.2.2_RB1.04.04.04.087.036 based on quic/aosp/LNX.LA.3.5.2.2_rb1
Merge tag 'AU_LINUX_ANDROID_LNX.LA.3.5.2.2_RB1.04.04.04.087.037' into HEAD

AU_LINUX_ANDROID_LNX.LA.3.5.2.2_RB1.04.04.04.087.037 based on quic/aosp/LNX.LA.3.5.2.2_rb1
Merge tag 'AU_LINUX_ANDROID_LNX.LA.3.5.2.2_RB1.04.04.04.087.038' into HEAD

AU_LINUX_ANDROID_LNX.LA.3.5.2.2_RB1.04.04.04.087.038 based on quic/aosp/LNX.LA.3.5.2.2_rb1
Merge tag 'AU_LINUX_ANDROID_LNX.LA.3.5.2.2_RB1.04.04.04.087.039' into HEAD

AU_LINUX_ANDROID_LNX.LA.3.5.2.2_RB1.04.04.04.087.039 based on quic/aosp/LNX.LA.3.5.2.2_rb1

Conflicts:
	drivers/tty/serial/msm_serial_hs.c

Change-Id: I2b243a7513d014f1fdc8e9892c83709ebb09ac3e
mdss_mdp_trace.h: fix trace include path

Change-Id: Iadf19b5aec81a3f30873121da45e549204fd60b9