* 'android-4.9-q' of https://android.googlesource.com/kernel/common: (670 commits) Conflicts: drivers/char/random.c drivers/clk/qcom/clk-rcg2.c drivers/gpu/drm/msm/msm_gem.c drivers/net/phy/micrel.c drivers/of/base.c drivers/scsi/ufs/ufshcd.c drivers/usb/dwc3/gadget.c drivers/usb/gadget/function/f_fs.c drivers/usb/gadget/function/f_uac2.c include/uapi/linux/coresight-stm.h net/socket.c sound/core/rawmidi.c sound/usb/mixer.c Change-Id: I7e840687c52e36350d4310dbb5bcace1d53ebf24