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
..
inc	qcacld-3.0: Define wma_is_vdev_in_beaconning_mode	2016-02-08 15:50:39 -08:00
src	qcacld-3.0: Revert merge conflicts in wma_suspend_req	2016-02-08 15:50:39 -08:00