am 66bf9c42: (-s ours) am 26e08cb4: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit '66bf9c42970e42704a1618642662b9bc4997abfa':
  Fix 'restore STA reconnection behavior' cherry-pick
  Restore STA reconnection behavior
am 8084af89: Merge "nl80211: Register read_sta_data() handler for station only builds" into jb-mr1-dev

* commit '8084af89d283ed015e28a5eb781726ae5e138cf0':
  nl80211: Register read_sta_data() handler for station only builds
am 164eea3a: Merge "Fix REMOVE_NETWORK to not run operations with invalid current_ssid" into jb-mr1-dev

* commit '164eea3ac2d53d1fecf20d76fd6b9f1920c17df4':
  Fix REMOVE_NETWORK to not run operations with invalid current_ssid
am 37f5fa5a: Merge "Fix disconnection event processing" into jb-mr1-dev

* commit '37f5fa5a8706c16490dd841c280bc015f79d81da':
  Fix disconnection event processing
am dee117d0: Merge "SME: Fix disconnec-while-authenticating" into jb-mr1-dev

* commit 'dee117d008719acfac082af3740349fc86629627':
  SME: Fix disconnec-while-authenticating
am 31be0a4b: P2P: Allow p2p_invite-persistent to specify channel for GO

* commit '31be0a4b946ecab910c0a9af3837dbccea5d204b':
  P2P: Allow p2p_invite-persistent to specify channel for GO
am 5c44edb0: P2P: Do not fail p2p_group_remove just based on current_ssid

* commit '5c44edb00c9384534a1b50981071874436aaecd5':
  P2P: Do not fail p2p_group_remove just based on current_ssid
am 2d266067: AP: Configure basic rates from iface and not conf

* commit '2d266067893660e2a4b5f166a909ee8638a5c96a':
  AP: Configure basic rates from iface and not conf
am 8367dc90: Add WFD dev info in device found event

* commit '8367dc909f536f600c7474582fe0a96bef7c78fc':
  Add WFD dev info in device found event
am 4530cfd4: wpa_supplicant: Update to 07-Sep-2012 TOT

* commit '4530cfd4d14a77c58e35393b91e40f8dd9d62697':
  wpa_supplicant: Update to 07-Sep-2012 TOT
am a2854abb: wpa_supplicant: Postpone P2P scan if usual scan is in progress

* commit 'a2854abb63b41c123e4c78e5653a55d902f00be6':
  wpa_supplicant: Postpone P2P scan if usual scan is in progress
am 9bc61e18: Merge "Revert "wpa_supplicant: Explicitly enable 802.11n and 802.11d for qcwcn"" into jb-mr1-dev

* commit '9bc61e18ee9adc8511c55c6b6a3eca3dfd193e62':
  Revert "wpa_supplicant: Explicitly enable 802.11n and 802.11d for qcwcn"
am 5a85f720: Merge "clear wfd_dev_info_hex before use" into jb-mr1-dev

* commit '5a85f720c8e43866880fdf9446dc5ad9f45e9091':
  clear wfd_dev_info_hex before use
am f4f5db31: wpa_supplicant: Improve scan during p2p_find

* commit 'f4f5db315918f3f048324ea43dc37a3b0fb31ecc':
  wpa_supplicant: Improve scan during p2p_find
Reconcile with jb-mr1-release - do not merge

Change-Id: Ib4e56e8c6a3ec814cff5eff35b9bdc80d3dcbc1d
am 07f427a8: wpa_supplicant: Fix P2P command processing

* commit '07f427a83c1bd048f8c4b6515d45f81e96877e37':
  wpa_supplicant: Fix P2P command processing
am 2b380488: P2P: Skip join in case of provision discovery failure

* commit '2b380488c6b5d21e54e98397c7a8d6a9f16dd8b5':
  P2P: Skip join in case of provision discovery failure
am 07f427a8: wpa_supplicant: Fix P2P command processing

* commit '07f427a83c1bd048f8c4b6515d45f81e96877e37':
  wpa_supplicant: Fix P2P command processing
am 2b380488: P2P: Skip join in case of provision discovery failure

* commit '2b380488c6b5d21e54e98397c7a8d6a9f16dd8b5':
  P2P: Skip join in case of provision discovery failure
am 9bce59c7: wpa_supplicant: Update to 10-Sep-2012 TOT

* commit '9bce59c7fef20e34a05f04d1e33a4076083dca0c':
  wpa_supplicant: Update to 10-Sep-2012 TOT