Merge "msm_fb: display: add wfd clk ctrl in pipe_commit"
Conflicts:
	arch/arm/mach-msm/board-8960.c
	drivers/char/diag/diag_debugfs.c
	drivers/char/diag/diag_masks.c
	drivers/char/diag/diagchar_core.c
	drivers/media/video/msm_wfd/mdp-4-subdev.c
Merge "input: mpu3050: add enable/disable sysfs attribute"
Conflicts:
	drivers/char/diag/diag_debugfs.c
	drivers/char/diag/diag_masks.c
	drivers/char/diag/diagchar_core.c
Merge "trace: cpu_freq_switch: Add profiler for CPU frequency switch times"
Conflicts:
	drivers/char/diag/diag_debugfs.c
	drivers/char/diag/diag_masks.c
	drivers/char/diag/diagchar_core.c
ASoC: wcd9310: Update wcd9310 compander configuration

Update the Compander register settings to remain the default
settings after the system bootup and optimize compander
configuration sequence.

Change-Id: Ib475f3bb84414546b4ead1d3f013dc173317e1b3
Signed-off-by: Kuirong Wang <kuirongw@codeaurora.org>