tree bf293d3708f011b6772a1f7237dfe86db8c47703
parent 50b691dc36a8075e8f594e8bea93cb524fa6b1d2
author Dmitry Shmidt <dimitrysh@google.com> 1400796787 -0700
committer Dmitry Shmidt <dimitrysh@google.com> 1400796787 -0700

Cumulative patch from commit 2396f02a431dd6e4526fd79c93f06695211cb3e4

2396f02 Reserve QCA vendor specific nl80211 commands 14..19
5661bd0 P2P: Avoid resetting pending_listen_freq if p2p_listen is pending
8802326 nl80211: Indicate SHA256-based AKM suites in CONNECT/ASSOCIATE

Change-Id: Id62b66e9683e87e888b91e0fd6407c1beb87b9c6
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>