Merge remote-tracking branch 'aosp/android-4.4.y' into kernel-4.4

author Chih-Wei Huang <cwhuang@linux.org.tw>

Fri, 28 Oct 2016 10:03:46 +0000 (18:03 +0800)

committer Chih-Wei Huang <cwhuang@linux.org.tw>

Fri, 28 Oct 2016 10:03:46 +0000 (18:03 +0800)
author Chih-Wei Huang <cwhuang@linux.org.tw>
Fri, 28 Oct 2016 10:03:46 +0000 (18:03 +0800)
committer Chih-Wei Huang <cwhuang@linux.org.tw>
Fri, 28 Oct 2016 10:03:46 +0000 (18:03 +0800)
diff --cc drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c
Simple merge
diff --cc fs/fuse/dir.c
Simple merge
author	Chih-Wei Huang <cwhuang@linux.org.tw>
	Fri, 28 Oct 2016 10:03:46 +0000 (18:03 +0800)
committer	Chih-Wei Huang <cwhuang@linux.org.tw>
	Fri, 28 Oct 2016 10:03:46 +0000 (18:03 +0800)
		1	2
drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/fuse/dir.c	patch \|	diff1 \|	diff2 \|	blob \| history