Merge "cfg80211: Add AP stopped interface"
video/vidc: merge from jb_2.6
cfg80211: add flags to define country IE processing rules
prima: sync to v3.2.2.17