Houston Hoffman 616679618f qcacld-3.0: Revert merge conflicts in wma_suspend_req ... wma_suspend_req is rewritten in changes I020fc8864dbf7378805361d54dc6cff60b2652e5 and I95876979652ab16976f23561038c877cee4c930a Revert "qcacld-3.0: Fix the PNO WoW is not configured in concurrency case" This reverts commit 3bf7846a5ee12e0641f90b9ff05a80a068cde777. Revert "qcacld-3.0: Cleanup WOW_NLO_SCAN_COMPLETE_EVENT" This reverts commit 8098644b8cbf89f23442c5bef02f186460cd9f8f. Revert "qcacld-3.0: Find extscan_in_progress irrespective of connected or pno" This reverts commit 7bb7f564b75965bfbf09fef6b5406aaa19c245a7. Change-Id: If0953ad7ca8d7224c87f026e77d1a3f256c4f124 CRs-Fixed: 935297		2016-02-08 15:50:39 -08:00
..
bmi	qcacld-3.0: Remove IHELIUM_BU flag	2016-02-08 15:50:39 -08:00
cdf	qcacld-3.0: Rename cdf_sched_work to cdf_schedule_work	2016-02-08 15:50:39 -08:00
cds	qcacld-3.0: Rename cdf_sched_work to cdf_schedule_work	2016-02-08 15:50:39 -08:00
dp	qcacld-3.0: Replace ServiceID with service_id	2016-02-08 15:50:39 -08:00
hdd	qcacld-3.0: Add config for the MCC restriction on Adrastea emulation	2016-02-08 15:50:39 -08:00
hif	qcacld-3.0: Replace EndPoint with endpoint	2016-02-08 15:50:39 -08:00
htc	qcacld-3.0: Replace ServiceID with service_id	2016-02-08 15:50:39 -08:00
mac	qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in tSirNsOffloadReq	2016-02-08 15:50:39 -08:00
sap	qcacld-3.0: Send management frame indication directly to HDD from PE	2016-02-08 15:50:39 -08:00
sme	qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in tSirTdlsSendMgmtReq	2016-02-08 15:50:39 -08:00
utils	qcacld-3.0: Replace ServiceID with service_id	2016-02-08 15:50:39 -08:00
wma	qcacld-3.0: Revert merge conflicts in wma_suspend_req	2016-02-08 15:50:39 -08:00
wmi	qcacld-3.0: Replace ServiceID with service_id	2016-02-08 15:50:39 -08:00