staging: prima: Merge AU_LINUX_ANDROID_KK_2.7_RB1.04.04.04.007.066

Merge "Merge AU_LINUX_ANDROID_KK_2.7_RB1.04.04.04.007.066 on remote branch"
Merge AU_LINUX_ANDROID_KK_2.7_RB1.04.04.04.007.066 on remote branch
Merge "Merge "wlan: add check for size of cache aligned skb->data""
Merge "wlan: add check for size of cache aligned skb->data"
wlan: add check for size of cache aligned skb->data
Merge "Merge "wlan:Fix kernel panic while TDLS exit.""
Merge "wlan:Fix kernel panic while TDLS exit."
Merge "wlan: do not process HT IE change if RoC is in progress"
wlan:Fix kernel panic while TDLS exit.
Merge "Merge "wlan: Disable TX Async logic.""
Merge "wlan: Disable TX Async logic."
wlan: Disable TX Async logic.
Merge "Merge "wlan: Avoid the race conditon when deauth ind is stuck.""
Merge "wlan: Avoid the race conditon when deauth ind is stuck."
wlan: Avoid the race conditon when deauth ind is stuck.
Merge "Merge "Send response to SME when switch channel fails.""
Merge "Send response to SME when switch channel fails."
Merge "wlan: Fail to load driver if INI file is corrupted"
wlan: Fail to load driver if INI file is corrupted
wlan: do not process HT IE change if RoC is in progress
Send response to SME when switch channel fails.
Merge "Merge "wlan: Fix kernel panic calling ioctl setTrafficMon.""
Merge "wlan: Fix kernel panic calling ioctl setTrafficMon."
Merge "wlan: Fix dangling pAdapter pointer in HDD."
Merge "wlan: Return failure if NV is not proper"
Merge "wlan: Avoid race condition in locking of tx queues per staId."
Merge "wlan: Add NULL check for FTM ioctls."
Merge "wlan: Increase the SSR WAIT time"
wlan: Fix kernel panic calling ioctl setTrafficMon.
wlan: Add NULL check for FTM ioctls.
wlan: Increase the SSR WAIT time
wlan: Fix dangling pAdapter pointer in HDD.

Change-Id: I363cdb920ab83b2b772361b2ed7b7bb61e0c118c

Conflicts:
	drivers/staging/prima_jb3.2/CORE/HDD/src/wlan_hdd_ftm.c
	drivers/staging/prima_jb3.2/CORE/HDD/src/wlan_hdd_hostapd.c
	drivers/staging/prima_jb3.2/CORE/HDD/src/wlan_hdd_tdls.c
	drivers/staging/prima_jb3.2/CORE/VOSS/src/vos_sched.c
	drivers/staging/prima_jb3.2/CORE/WDI/TRP/DTS/src/wlan_qct_wdi_dts.c
Revert "staging: prima: Merge AU_LINUX_ANDROID_KK_2.7_RB1.04.04.04.007.066"

This reverts commit 9abca2a14cb5e9400e95c2a83c14db26dc20b79f.