The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/531607b0e932398393355b038b260a3c9b84437f

commit 531607b0e932398393355b038b260a3c9b84437f
Author: Guenter Roeck <groeck@chromium.org>
Date: Tue Jun 28 21:44:01 2016

UPSTREAM: Merge tag 'v4.4.14' into chromeos-4.4

This is the 4.4.14 stable release

Conflicts:
	drivers/char/tpm/tpm-chip.c
	drivers/char/tpm/tpm_crb.c
	drivers/clk/rockchip/clk-rk3368.c
	drivers/clk/rockchip/clk.c
	drivers/gpu/drm/i915/i915_drv.c
	drivers/gpu/drm/i915/i915_drv.h
	drivers/gpu/drm/i915/intel_csr.c
	drivers/gpu/drm/i915/intel_ddi.c
	drivers/gpu/drm/i915/intel_ringbuffer.c
	drivers/input/misc/pwm-beeper.c
	drivers/media/v4l2-core/v4l2-compat-ioctl32.c
	drivers/soc/rockchip/pm_domains.c
	include/linux/dcache.h
	mm/memcontrol.c
	net/bluetooth/mgmt.c
	arch/arm64/kernel/cpuinfo.c

Fixed merge damage in sound/usb/mixer_maps.c.

BUG= chromium:624141 
TEST=Build and load images onto chell, gru, kevin

Change-Id: Ifb01d17b7d4174c40865644ba1c94413284f6f59
Signed-off-by: Guenter Roeck <groeck@chromium.org>

[modify] https://crrev.com/531607b0e932398393355b038b260a3c9b84437f/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
[modify] https://crrev.com/531607b0e932398393355b038b260a3c9b84437f/include/linux/dcache.h
[modify] https://crrev.com/531607b0e932398393355b038b260a3c9b84437f/drivers/char/tpm/tpm-chip.c
[modify] https://crrev.com/531607b0e932398393355b038b260a3c9b84437f/sound/soc/soc-dapm.c
[modify] https://crrev.com/531607b0e932398393355b038b260a3c9b84437f/drivers/soc/rockchip/pm_domains.c
[modify] https://crrev.com/531607b0e932398393355b038b260a3c9b84437f/mm/memcontrol.c
[delete] https://crrev.com/b1944a54e486db318f49a376bb27de251d4d76c5/drivers/net/wireless/iwlwifi/pcie/trans.c
[modify] https://crrev.com/531607b0e932398393355b038b260a3c9b84437f/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
[modify] https://crrev.com/531607b0e932398393355b038b260a3c9b84437f/arch/arm64/kernel/cpuinfo.c
[modify] https://crrev.com/531607b0e932398393355b038b260a3c9b84437f/drivers/char/tpm/tpm_crb.c
[modify] https://crrev.com/531607b0e932398393355b038b260a3c9b84437f/drivers/gpu/drm/i915/intel_ringbuffer.c
[delete] https://crrev.com/b1944a54e486db318f49a376bb27de251d4d76c5/drivers/net/wireless/iwlwifi/mvm/mac80211.c
[modify] https://crrev.com/531607b0e932398393355b038b260a3c9b84437f/drivers/gpu/drm/i915/intel_ddi.c
[modify] https://crrev.com/531607b0e932398393355b038b260a3c9b84437f/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
[modify] https://crrev.com/531607b0e932398393355b038b260a3c9b84437f/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
[modify] https://crrev.com/531607b0e932398393355b038b260a3c9b84437f/drivers/gpu/drm/i915/i915_drv.c
[modify] https://crrev.com/531607b0e932398393355b038b260a3c9b84437f/drivers/thermal/thermal_core.c
[modify] https://crrev.com/531607b0e932398393355b038b260a3c9b84437f/drivers/gpu/drm/i915/i915_drv.h
[modify] https://crrev.com/531607b0e932398393355b038b260a3c9b84437f/drivers/clk/rockchip/clk-rk3368.c
[modify] https://crrev.com/531607b0e932398393355b038b260a3c9b84437f/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
[delete] https://crrev.com/b1944a54e486db318f49a376bb27de251d4d76c5/drivers/net/wireless/iwlwifi/mvm/mvm.h
[modify] https://crrev.com/531607b0e932398393355b038b260a3c9b84437f/net/bluetooth/mgmt.c
[delete] https://crrev.com/b1944a54e486db318f49a376bb27de251d4d76c5/drivers/net/wireless/mwifiex/sta_ioctl.c
[modify] https://crrev.com/531607b0e932398393355b038b260a3c9b84437f/drivers/input/misc/pwm-beeper.c
[modify] https://crrev.com/531607b0e932398393355b038b260a3c9b84437f/sound/usb/mixer_maps.c
[modify] https://crrev.com/531607b0e932398393355b038b260a3c9b84437f/drivers/gpu/drm/i915/intel_csr.c
[modify] https://crrev.com/531607b0e932398393355b038b260a3c9b84437f/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
[delete] https://crrev.com/b1944a54e486db318f49a376bb27de251d4d76c5/drivers/net/wireless/iwlwifi/mvm/fw.c
[delete] https://crrev.com/b1944a54e486db318f49a376bb27de251d4d76c5/drivers/net/wireless/iwlwifi/mvm/tx.c