* 'android-4.9-q' of https://android.googlesource.com/kernel/common: (2014 commits) Conflicts: arch/arm64/kernel/psci.c arch/arm64/mm/mmu.c drivers/gpu/drm/drm_property.c drivers/hid/hid-core.c drivers/pinctrl/qcom/pinctrl-spmi-gpio.c drivers/thermal/thermal_core.c drivers/usb/dwc3/core.c drivers/usb/host/xhci.c fs/f2fs/segment.c fs/f2fs/super.c include/linux/libfdt_env.h include/trace/events/sched.h kernel/locking/spinlock_debug.c kernel/sched/core.c kernel/time/hrtimer.c net/wireless/util.c Change-Id: I39072f45a8dc42a7bbe29eb52ed48a15c028869c