oppo: net/netfilter

Conflicts:
	net/netfilter/xt_qtaguid.c
find5: ifdef changes
oppo: net/wireless

Conflicts:
	net/wireless/nl80211.c
find5: ifdef changes
oppo: sound/soc/codecs
find5: ifdef changes
oppo: sound/soc/msm
find5: ifdef changes
oppo: sound/soc/msm/qdsp6
find5: ifdef changes