tree a08770141ba09b780351c7788773869c8e10bc8e
parent 853b7cee846d3ea794f500af74bf3f460e40ef83
parent cfe37e12783e8f9e7b3eabcbd5b499bda1a74ad9
author Guenter Roeck <groeck@chromium.org> 1486138023 -0800
committer Guenter Roeck <groeck@chromium.org> 1493741209 -0700

CHROMIUM: Merge tag 'v4.4.64' into chromeos-4.4

Merge of v4.4.64 into chromeos-4.4

The following patch has been reverted from v4.4.64 prior to the merge
since the removed code is used by Lakitu.

	0c0be310ba29 netlink: remove mmapped netlink support

Conflicts:
	net/wireless/nl80211.c
	fs/namespace.c
	drivers/usb/host/xhci-plat.c
	drivers/usb/dwc3/gadget.c
	drivers/char/tpm/tpm_tis.c
	drivers/gpu/drm/i915/intel_pm.c

BUG=chromium:711780
TEST=Build and test on Kevin, Gru, Reef, Chell with 4.4 kernel

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