Add prima driver from CM11 MAKO kernel

Conflicts:

	.gitignore
	arch/arm/configs/nex_defconfig
	arch/arm/mach-msm/wcnss-ssr-8960.c
	drivers/net/wireless/wcnss/wcnss_riva.c
	drivers/net/wireless/wcnss/wcnss_wlan.c
	drivers/staging/Makefile
	drivers/staging/prima/CORE/BAP/inc/bapApi.h
	drivers/staging/prima/CORE/BAP/inc/btampHCI.h
	drivers/staging/prima/CORE/BAP/src/bapApiData.c
	drivers/staging/prima/CORE/BAP/src/bapApiDebug.c
	drivers/staging/prima/CORE/BAP/src/bapApiExt.c
	drivers/staging/prima/CORE/BAP/src/bapApiExt.h
	drivers/staging/prima/CORE/BAP/src/bapApiHCBB.c
	drivers/staging/prima/CORE/BAP/src/bapApiInfo.c
	drivers/staging/prima/CORE/BAP/src/bapApiLinkCntl.c
	drivers/staging/prima/CORE/BAP/src/bapApiLinkSupervision.c
	drivers/staging/prima/CORE/BAP/src/bapApiStatus.c
	drivers/staging/prima/CORE/BAP/src/bapApiTimer.c
	drivers/staging/prima/CORE/BAP/src/bapApiTimer.h
	drivers/staging/prima/CORE/BAP/src/bapInternal.h
	drivers/staging/prima/CORE/BAP/src/bapModule.c
	drivers/staging/prima/CORE/BAP/src/bapRsn8021xAuthFsm.c
	drivers/staging/prima/CORE/BAP/src/bapRsn8021xAuthFsm.h
	drivers/staging/prima/CORE/BAP/src/bapRsn8021xFsm.h
	drivers/staging/prima/CORE/BAP/src/bapRsn8021xPrf.c
	drivers/staging/prima/CORE/BAP/src/bapRsn8021xPrf.h
	drivers/staging/prima/CORE/BAP/src/bapRsn8021xSuppRsnFsm.c
	drivers/staging/prima/CORE/BAP/src/bapRsn8021xSuppRsnFsm.h
	drivers/staging/prima/CORE/BAP/src/bapRsnAsfPacket.c
	drivers/staging/prima/CORE/BAP/src/bapRsnAsfPacket.h
	drivers/staging/prima/CORE/BAP/src/bapRsnErrors.h
	drivers/staging/prima/CORE/BAP/src/bapRsnSsmAesKeyWrap.c
	drivers/staging/prima/CORE/BAP/src/bapRsnSsmAesKeyWrap.h
	drivers/staging/prima/CORE/BAP/src/bapRsnSsmEapol.c
	drivers/staging/prima/CORE/BAP/src/bapRsnSsmEapol.h
	drivers/staging/prima/CORE/BAP/src/bapRsnSsmReplayCtr.c
	drivers/staging/prima/CORE/BAP/src/bapRsnSsmReplayCtr.h
	drivers/staging/prima/CORE/BAP/src/bapRsnSsmServices.h
	drivers/staging/prima/CORE/BAP/src/bapRsnTxRx.c
	drivers/staging/prima/CORE/BAP/src/bapRsnTxRx.h
	drivers/staging/prima/CORE/BAP/src/btampFsm.c
	drivers/staging/prima/CORE/BAP/src/btampFsm.h
	drivers/staging/prima/CORE/BAP/src/btampFsm_ext.h
	drivers/staging/prima/CORE/BAP/src/btampHCI.c
	drivers/staging/prima/CORE/BAP/src/fsmDefs.h
	drivers/staging/prima/CORE/DXE/inc/wlan_qct_dxe.h
	drivers/staging/prima/CORE/DXE/src/wlan_qct_dxe.c
	drivers/staging/prima/CORE/DXE/src/wlan_qct_dxe_cfg_i.c
	drivers/staging/prima/CORE/DXE/src/wlan_qct_dxe_i.h
	drivers/staging/prima/CORE/HDD/inc/bap_hdd_main.h
	drivers/staging/prima/CORE/HDD/inc/bap_hdd_misc.h
	drivers/staging/prima/CORE/HDD/inc/qc_sap_ioctl.h
	drivers/staging/prima/CORE/HDD/inc/wlan_hdd_assoc.h
	drivers/staging/prima/CORE/HDD/inc/wlan_hdd_cfg.h
	drivers/staging/prima/CORE/HDD/inc/wlan_hdd_cfg80211.h
	drivers/staging/prima/CORE/HDD/inc/wlan_hdd_dev_pwr.h
	drivers/staging/prima/CORE/HDD/inc/wlan_hdd_dp_utils.h
	drivers/staging/prima/CORE/HDD/inc/wlan_hdd_ether.h
	drivers/staging/prima/CORE/HDD/inc/wlan_hdd_ftm.h
	drivers/staging/prima/CORE/HDD/inc/wlan_hdd_host_offload.h
	drivers/staging/prima/CORE/HDD/inc/wlan_hdd_hostapd.h
	drivers/staging/prima/CORE/HDD/inc/wlan_hdd_includes.h
	drivers/staging/prima/CORE/HDD/inc/wlan_hdd_keep_alive.h
	drivers/staging/prima/CORE/HDD/inc/wlan_hdd_main.h
	drivers/staging/prima/CORE/HDD/inc/wlan_hdd_mib.h
	drivers/staging/prima/CORE/HDD/inc/wlan_hdd_oemdata.h
	drivers/staging/prima/CORE/HDD/inc/wlan_hdd_p2p.h
	drivers/staging/prima/CORE/HDD/inc/wlan_hdd_packet_filtering.h
	drivers/staging/prima/CORE/HDD/inc/wlan_hdd_power.h
	drivers/staging/prima/CORE/HDD/inc/wlan_hdd_softap_tx_rx.h
	drivers/staging/prima/CORE/HDD/inc/wlan_hdd_tx_rx.h
	drivers/staging/prima/CORE/HDD/inc/wlan_hdd_version.h
	drivers/staging/prima/CORE/HDD/inc/wlan_hdd_wext.h
	drivers/staging/prima/CORE/HDD/inc/wlan_hdd_wmm.h
	drivers/staging/prima/CORE/HDD/inc/wlan_hdd_wowl.h
	drivers/staging/prima/CORE/HDD/inc/wlan_qct_driver.h
	drivers/staging/prima/CORE/HDD/src/bap_hdd_main.c
	drivers/staging/prima/CORE/HDD/src/wlan_hdd_assoc.c
	drivers/staging/prima/CORE/HDD/src/wlan_hdd_cfg.c
	drivers/staging/prima/CORE/HDD/src/wlan_hdd_cfg80211.c
	drivers/staging/prima/CORE/HDD/src/wlan_hdd_dev_pwr.c
	drivers/staging/prima/CORE/HDD/src/wlan_hdd_dp_utils.c
	drivers/staging/prima/CORE/HDD/src/wlan_hdd_early_suspend.c
	drivers/staging/prima/CORE/HDD/src/wlan_hdd_ftm.c
	drivers/staging/prima/CORE/HDD/src/wlan_hdd_hostapd.c
	drivers/staging/prima/CORE/HDD/src/wlan_hdd_main.c
	drivers/staging/prima/CORE/HDD/src/wlan_hdd_mib.c
	drivers/staging/prima/CORE/HDD/src/wlan_hdd_oemdata.c
	drivers/staging/prima/CORE/HDD/src/wlan_hdd_p2p.c
	drivers/staging/prima/CORE/HDD/src/wlan_hdd_scan.c
	drivers/staging/prima/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
	drivers/staging/prima/CORE/HDD/src/wlan_hdd_tx_rx.c
	drivers/staging/prima/CORE/HDD/src/wlan_hdd_wext.c
	drivers/staging/prima/CORE/HDD/src/wlan_hdd_wmm.c
	drivers/staging/prima/CORE/HDD/src/wlan_hdd_wowl.c
	drivers/staging/prima/CORE/MAC/inc/aniCompiler.h
	drivers/staging/prima/CORE/MAC/inc/aniDbgTest.h
	drivers/staging/prima/CORE/MAC/inc/aniGlobal.h
	drivers/staging/prima/CORE/MAC/inc/aniParam.h
	drivers/staging/prima/CORE/MAC/inc/aniSystemDefs.h
	drivers/staging/prima/CORE/MAC/inc/logDump.h
	drivers/staging/prima/CORE/MAC/inc/macInitApi.h
	drivers/staging/prima/CORE/MAC/inc/macTrace.h
	drivers/staging/prima/CORE/MAC/inc/qwlan_version.h
	drivers/staging/prima/CORE/MAC/inc/sirApi.h
	drivers/staging/prima/CORE/MAC/inc/sirMacPropExts.h
	drivers/staging/prima/CORE/MAC/inc/sirMacProtDef.h
	drivers/staging/prima/CORE/MAC/inc/sirTypes.h
	drivers/staging/prima/CORE/MAC/inc/wniApi.h
	drivers/staging/prima/CORE/MAC/inc/wniCfgAp.h
	drivers/staging/prima/CORE/MAC/inc/wniCfgSta.h
	drivers/staging/prima/CORE/MAC/inc/wniStat.h
	drivers/staging/prima/CORE/MAC/src/cfg/cfgApi.c
	drivers/staging/prima/CORE/MAC/src/cfg/cfgDebug.c
	drivers/staging/prima/CORE/MAC/src/cfg/cfgDebug.h
	drivers/staging/prima/CORE/MAC/src/cfg/cfgDef.h
	drivers/staging/prima/CORE/MAC/src/cfg/cfgParamName.c
	drivers/staging/prima/CORE/MAC/src/cfg/cfgPriv.h
	drivers/staging/prima/CORE/MAC/src/cfg/cfgProcMsg.c
	drivers/staging/prima/CORE/MAC/src/cfg/cfgSendMsg.c
	drivers/staging/prima/CORE/MAC/src/cfg/cfgUtil/cfg.txt
	drivers/staging/prima/CORE/MAC/src/cfg/polFile.h
	drivers/staging/prima/CORE/MAC/src/dph/dphHashTable.c
	drivers/staging/prima/CORE/MAC/src/dph/dphHashTable.h
	drivers/staging/prima/CORE/MAC/src/include/cfgApi.h
	drivers/staging/prima/CORE/MAC/src/include/cfgGlobal.h
	drivers/staging/prima/CORE/MAC/src/include/dot11f.h
	drivers/staging/prima/CORE/MAC/src/include/dphGlobal.h
	drivers/staging/prima/CORE/MAC/src/include/parserApi.h
	drivers/staging/prima/CORE/MAC/src/include/phyGlobal.h
	drivers/staging/prima/CORE/MAC/src/include/sirCommon.h
	drivers/staging/prima/CORE/MAC/src/include/sirDebug.h
	drivers/staging/prima/CORE/MAC/src/include/sirParams.h
	drivers/staging/prima/CORE/MAC/src/include/sysGlobal.h
	drivers/staging/prima/CORE/MAC/src/include/utilsApi.h
	drivers/staging/prima/CORE/MAC/src/include/utilsGlobal.h
	drivers/staging/prima/CORE/MAC/src/pe/include/limAdmitControl.h
	drivers/staging/prima/CORE/MAC/src/pe/include/limApi.h
	drivers/staging/prima/CORE/MAC/src/pe/include/limFT.h
	drivers/staging/prima/CORE/MAC/src/pe/include/limFTDefs.h
	drivers/staging/prima/CORE/MAC/src/pe/include/limGlobal.h
	drivers/staging/prima/CORE/MAC/src/pe/include/limSession.h
	drivers/staging/prima/CORE/MAC/src/pe/include/limTrace.h
	drivers/staging/prima/CORE/MAC/src/pe/include/pmmApi.h
	drivers/staging/prima/CORE/MAC/src/pe/include/pmmGlobal.h
	drivers/staging/prima/CORE/MAC/src/pe/include/rrmApi.h
	drivers/staging/prima/CORE/MAC/src/pe/include/rrmGlobal.h
	drivers/staging/prima/CORE/MAC/src/pe/include/schApi.h
	drivers/staging/prima/CORE/MAC/src/pe/include/schGlobal.h
	drivers/staging/prima/CORE/MAC/src/pe/include/wmmApsd.h
	drivers/staging/prima/CORE/MAC/src/pe/lim/limAIDmgmt.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limAdmitControl.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limApi.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limAssocUtils.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limAssocUtils.h
	drivers/staging/prima/CORE/MAC/src/pe/lim/limDebug.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limDebug.h
	drivers/staging/prima/CORE/MAC/src/pe/lim/limFT.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limIbssPeerMgmt.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limIbssPeerMgmt.h
	drivers/staging/prima/CORE/MAC/src/pe/lim/limLinkMonitoringAlgo.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limLogDump.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limP2P.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limProcessActionFrame.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limProcessAssocRspFrame.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limProcessAuthFrame.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limProcessBeaconFrame.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limProcessCfgUpdates.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limProcessDeauthFrame.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limProcessDisassocFrame.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limProcessLmmMessages.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limProcessProbeReqFrame.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limProcessProbeRspFrame.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limPropExtsUtils.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limPropExtsUtils.h
	drivers/staging/prima/CORE/MAC/src/pe/lim/limRoamingAlgo.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limScanResultUtils.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limScanResultUtils.h
	drivers/staging/prima/CORE/MAC/src/pe/lim/limSecurityUtils.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limSecurityUtils.h
	drivers/staging/prima/CORE/MAC/src/pe/lim/limSendManagementFrames.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limSendMessages.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limSendMessages.h
	drivers/staging/prima/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limSendSmeRspMessages.h
	drivers/staging/prima/CORE/MAC/src/pe/lim/limSerDesUtils.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limSerDesUtils.h
	drivers/staging/prima/CORE/MAC/src/pe/lim/limSession.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limSessionUtils.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limSessionUtils.h
	drivers/staging/prima/CORE/MAC/src/pe/lim/limSmeReqUtils.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limSmeReqUtils.h
	drivers/staging/prima/CORE/MAC/src/pe/lim/limStaHashApi.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limStaHashApi.h
	drivers/staging/prima/CORE/MAC/src/pe/lim/limTimerUtils.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limTimerUtils.h
	drivers/staging/prima/CORE/MAC/src/pe/lim/limTrace.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limTypes.h
	drivers/staging/prima/CORE/MAC/src/pe/lim/limUtils.c
	drivers/staging/prima/CORE/MAC/src/pe/lim/limUtils.h
	drivers/staging/prima/CORE/MAC/src/pe/pmm/pmmAP.c
	drivers/staging/prima/CORE/MAC/src/pe/pmm/pmmApi.c
	drivers/staging/prima/CORE/MAC/src/pe/pmm/pmmDebug.c
	drivers/staging/prima/CORE/MAC/src/pe/pmm/pmmDebug.h
	drivers/staging/prima/CORE/MAC/src/pe/rrm/rrmApi.c
	drivers/staging/prima/CORE/MAC/src/pe/sch/schApi.c
	drivers/staging/prima/CORE/MAC/src/pe/sch/schBeaconGen.c
	drivers/staging/prima/CORE/MAC/src/pe/sch/schBeaconProcess.c
	drivers/staging/prima/CORE/MAC/src/pe/sch/schDebug.c
	drivers/staging/prima/CORE/MAC/src/pe/sch/schDebug.h
	drivers/staging/prima/CORE/MAC/src/pe/sch/schMessage.c
	drivers/staging/prima/CORE/MAC/src/pe/sch/schSysParams.h
	drivers/staging/prima/CORE/SAP/inc/sapApi.h
	drivers/staging/prima/CORE/SAP/src/sapApiLinkCntl.c
	drivers/staging/prima/CORE/SAP/src/sapChSelect.c
	drivers/staging/prima/CORE/SAP/src/sapChSelect.h
	drivers/staging/prima/CORE/SAP/src/sapFsm.c
	drivers/staging/prima/CORE/SAP/src/sapFsm_ext.h
	drivers/staging/prima/CORE/SAP/src/sapInternal.h
	drivers/staging/prima/CORE/SAP/src/sapModule.c
	drivers/staging/prima/CORE/SME/inc/btcApi.h
	drivers/staging/prima/CORE/SME/inc/ccmApi.h
	drivers/staging/prima/CORE/SME/inc/csrApi.h
	drivers/staging/prima/CORE/SME/inc/csrInternal.h
	drivers/staging/prima/CORE/SME/inc/csrLinkList.h
	drivers/staging/prima/CORE/SME/inc/csrNeighborRoam.h
	drivers/staging/prima/CORE/SME/inc/csrSupport.h
	drivers/staging/prima/CORE/SME/inc/oemDataApi.h
	drivers/staging/prima/CORE/SME/inc/oemDataInternal.h
	drivers/staging/prima/CORE/SME/inc/p2p_Api.h
	drivers/staging/prima/CORE/SME/inc/pmc.h
	drivers/staging/prima/CORE/SME/inc/pmcApi.h
	drivers/staging/prima/CORE/SME/inc/smeInside.h
	drivers/staging/prima/CORE/SME/inc/smeInternal.h
	drivers/staging/prima/CORE/SME/inc/smeQosInternal.h
	drivers/staging/prima/CORE/SME/inc/smeRrmInternal.h
	drivers/staging/prima/CORE/SME/inc/sme_Api.h
	drivers/staging/prima/CORE/SME/inc/sme_FTApi.h
	drivers/staging/prima/CORE/SME/inc/sme_QosApi.h
	drivers/staging/prima/CORE/SME/inc/sme_RrmApi.h
	drivers/staging/prima/CORE/SME/inc/smsDebug.h
	drivers/staging/prima/CORE/SME/inc/wlan_ps_wow_diag.h
	drivers/staging/prima/CORE/SME/src/QoS/sme_Qos.c
	drivers/staging/prima/CORE/SME/src/btc/btcApi.c
	drivers/staging/prima/CORE/SME/src/ccm/ccmApi.c
	drivers/staging/prima/CORE/SME/src/ccm/ccmLogDump.c
	drivers/staging/prima/CORE/SME/src/csr/csrApiRoam.c
	drivers/staging/prima/CORE/SME/src/csr/csrApiScan.c
	drivers/staging/prima/CORE/SME/src/csr/csrCmdProcess.c
	drivers/staging/prima/CORE/SME/src/csr/csrInsideApi.h
	drivers/staging/prima/CORE/SME/src/csr/csrLinkList.c
	drivers/staging/prima/CORE/SME/src/csr/csrLogDump.c
	drivers/staging/prima/CORE/SME/src/csr/csrNeighborRoam.c
	drivers/staging/prima/CORE/SME/src/csr/csrUtil.c
	drivers/staging/prima/CORE/SME/src/oemData/oemDataApi.c
	drivers/staging/prima/CORE/SME/src/p2p/p2p_Api.c
	drivers/staging/prima/CORE/SME/src/pmc/pmc.c
	drivers/staging/prima/CORE/SME/src/pmc/pmcApi.c
	drivers/staging/prima/CORE/SME/src/pmc/pmcLogDump.c
	drivers/staging/prima/CORE/SME/src/rrm/sme_rrm.c
	drivers/staging/prima/CORE/SME/src/sme_common/sme_Api.c
	drivers/staging/prima/CORE/SME/src/sme_common/sme_FTApi.c
	drivers/staging/prima/CORE/SVC/external/wlan_nlink_common.h
	drivers/staging/prima/CORE/SVC/inc/wlan_btc_svc.h
	drivers/staging/prima/CORE/SVC/inc/wlan_nlink_srv.h
	drivers/staging/prima/CORE/SVC/inc/wlan_ptt_sock_svc.h
	drivers/staging/prima/CORE/SVC/src/btc/wlan_btc_svc.c
	drivers/staging/prima/CORE/SVC/src/nlink/wlan_nlink_srv.c
	drivers/staging/prima/CORE/SVC/src/ptt/wlan_ptt_sock_svc.c
	drivers/staging/prima/CORE/SYS/common/inc/wlan_qct_sys.h
	drivers/staging/prima/CORE/SYS/common/src/wlan_qct_sys.c
	drivers/staging/prima/CORE/SYS/legacy/src/pal/inc/palApi.h
	drivers/staging/prima/CORE/SYS/legacy/src/pal/inc/palPipes.h
	drivers/staging/prima/CORE/SYS/legacy/src/pal/inc/palTimer.h
	drivers/staging/prima/CORE/SYS/legacy/src/pal/src/palApiComm.c
	drivers/staging/prima/CORE/SYS/legacy/src/pal/src/palTimer.c
	drivers/staging/prima/CORE/SYS/legacy/src/platform/inc/VossWrapper.h
	drivers/staging/prima/CORE/SYS/legacy/src/platform/src/VossWrapper.c
	drivers/staging/prima/CORE/SYS/legacy/src/system/inc/sysDebug.h
	drivers/staging/prima/CORE/SYS/legacy/src/system/inc/sysDef.h
	drivers/staging/prima/CORE/SYS/legacy/src/system/inc/sysEntryFunc.h
	drivers/staging/prima/CORE/SYS/legacy/src/system/inc/sysStartup.h
	drivers/staging/prima/CORE/SYS/legacy/src/system/src/macInitApi.c
	drivers/staging/prima/CORE/SYS/legacy/src/system/src/sysEntryFunc.c
	drivers/staging/prima/CORE/SYS/legacy/src/system/src/sysWinStartup.c
	drivers/staging/prima/CORE/SYS/legacy/src/utils/inc/dot11fdefs.h
	drivers/staging/prima/CORE/SYS/legacy/src/utils/inc/utilsParser.h
	drivers/staging/prima/CORE/SYS/legacy/src/utils/src/dot11f.c
	drivers/staging/prima/CORE/SYS/legacy/src/utils/src/logApi.c
	drivers/staging/prima/CORE/SYS/legacy/src/utils/src/logDump.c
	drivers/staging/prima/CORE/SYS/legacy/src/utils/src/macTrace.c
	drivers/staging/prima/CORE/SYS/legacy/src/utils/src/parserApi.c
	drivers/staging/prima/CORE/SYS/legacy/src/utils/src/utilsApi.c
	drivers/staging/prima/CORE/SYS/legacy/src/utils/src/utilsParser.c
	drivers/staging/prima/CORE/TL/inc/tlDebug.h
	drivers/staging/prima/CORE/TL/inc/wlan_qct_tl.h
	drivers/staging/prima/CORE/TL/src/wlan_qct_tl.c
	drivers/staging/prima/CORE/TL/src/wlan_qct_tl_ba.c
	drivers/staging/prima/CORE/TL/src/wlan_qct_tl_hosupport.c
	drivers/staging/prima/CORE/TL/src/wlan_qct_tl_hosupport.h
	drivers/staging/prima/CORE/TL/src/wlan_qct_tli.h
	drivers/staging/prima/CORE/TL/src/wlan_qct_tli_ba.h
	drivers/staging/prima/CORE/VOSS/inc/event_defs.h
	drivers/staging/prima/CORE/VOSS/inc/i_vos_diag_core_event.h
	drivers/staging/prima/CORE/VOSS/inc/i_vos_diag_core_log.h
	drivers/staging/prima/CORE/VOSS/inc/i_vos_event.h
	drivers/staging/prima/CORE/VOSS/inc/i_vos_list.h
	drivers/staging/prima/CORE/VOSS/inc/i_vos_lock.h
	drivers/staging/prima/CORE/VOSS/inc/i_vos_packet.h
	drivers/staging/prima/CORE/VOSS/inc/i_vos_timer.h
	drivers/staging/prima/CORE/VOSS/inc/i_vos_trace.h
	drivers/staging/prima/CORE/VOSS/inc/i_vos_types.h
	drivers/staging/prima/CORE/VOSS/inc/log_codes.h
	drivers/staging/prima/CORE/VOSS/inc/vos_api.h
	drivers/staging/prima/CORE/VOSS/inc/vos_diag_core_event.h
	drivers/staging/prima/CORE/VOSS/inc/vos_diag_core_log.h
	drivers/staging/prima/CORE/VOSS/inc/vos_event.h
	drivers/staging/prima/CORE/VOSS/inc/vos_getBin.h
	drivers/staging/prima/CORE/VOSS/inc/vos_list.h
	drivers/staging/prima/CORE/VOSS/inc/vos_lock.h
	drivers/staging/prima/CORE/VOSS/inc/vos_memory.h
	drivers/staging/prima/CORE/VOSS/inc/vos_mq.h
	drivers/staging/prima/CORE/VOSS/inc/vos_nvitem.h
	drivers/staging/prima/CORE/VOSS/inc/vos_pack_align.h
	drivers/staging/prima/CORE/VOSS/inc/vos_packet.h
	drivers/staging/prima/CORE/VOSS/inc/vos_power.h
	drivers/staging/prima/CORE/VOSS/inc/vos_status.h
	drivers/staging/prima/CORE/VOSS/inc/vos_threads.h
	drivers/staging/prima/CORE/VOSS/inc/vos_timer.h
	drivers/staging/prima/CORE/VOSS/inc/vos_trace.h
	drivers/staging/prima/CORE/VOSS/inc/vos_types.h
	drivers/staging/prima/CORE/VOSS/inc/vos_utils.h
	drivers/staging/prima/CORE/VOSS/inc/wlan_hdd_misc.h
	drivers/staging/prima/CORE/VOSS/src/vos_api.c
	drivers/staging/prima/CORE/VOSS/src/vos_diag.c
	drivers/staging/prima/CORE/VOSS/src/vos_event.c
	drivers/staging/prima/CORE/VOSS/src/vos_getBin.c
	drivers/staging/prima/CORE/VOSS/src/vos_list.c
	drivers/staging/prima/CORE/VOSS/src/vos_lock.c
	drivers/staging/prima/CORE/VOSS/src/vos_memory.c
	drivers/staging/prima/CORE/VOSS/src/vos_mq.c
	drivers/staging/prima/CORE/VOSS/src/vos_nvitem.c
	drivers/staging/prima/CORE/VOSS/src/vos_packet.c
	drivers/staging/prima/CORE/VOSS/src/vos_power.c
	drivers/staging/prima/CORE/VOSS/src/vos_sched.c
	drivers/staging/prima/CORE/VOSS/src/vos_sched.h
	drivers/staging/prima/CORE/VOSS/src/vos_threads.c
	drivers/staging/prima/CORE/VOSS/src/vos_timer.c
	drivers/staging/prima/CORE/VOSS/src/vos_trace.c
	drivers/staging/prima/CORE/VOSS/src/vos_types.c
	drivers/staging/prima/CORE/VOSS/src/vos_utils.c
	drivers/staging/prima/CORE/WDA/inc/legacy/halMsgApi.h
	drivers/staging/prima/CORE/WDA/inc/legacy/halTypes.h
	drivers/staging/prima/CORE/WDA/inc/legacy/palTypes.h
	drivers/staging/prima/CORE/WDA/inc/legacy/wlan_qct_hal.h
	drivers/staging/prima/CORE/WDA/inc/wlan_qct_wda.h
	drivers/staging/prima/CORE/WDA/inc/wlan_qct_wda_msg.h
	drivers/staging/prima/CORE/WDA/src/wlan_nv.c
	drivers/staging/prima/CORE/WDA/src/wlan_qct_wda.c
	drivers/staging/prima/CORE/WDA/src/wlan_qct_wda_debug.c
	drivers/staging/prima/CORE/WDA/src/wlan_qct_wda_debug.h
	drivers/staging/prima/CORE/WDA/src/wlan_qct_wda_ds.c
	drivers/staging/prima/CORE/WDA/src/wlan_qct_wda_legacy.c
	drivers/staging/prima/CORE/WDI/CP/inc/wlan_qct_wdi.h
	drivers/staging/prima/CORE/WDI/CP/inc/wlan_qct_wdi_bd.h
	drivers/staging/prima/CORE/WDI/CP/inc/wlan_qct_wdi_cfg.h
	drivers/staging/prima/CORE/WDI/CP/inc/wlan_qct_wdi_dp.h
	drivers/staging/prima/CORE/WDI/CP/inc/wlan_qct_wdi_i.h
	drivers/staging/prima/CORE/WDI/CP/inc/wlan_qct_wdi_sta.h
	drivers/staging/prima/CORE/WDI/CP/src/wlan_qct_wdi.c
	drivers/staging/prima/CORE/WDI/CP/src/wlan_qct_wdi_dp.c
	drivers/staging/prima/CORE/WDI/CP/src/wlan_qct_wdi_sta.c
	drivers/staging/prima/CORE/WDI/DP/inc/wlan_qct_wdi_ds.h
	drivers/staging/prima/CORE/WDI/DP/inc/wlan_qct_wdi_ds_i.h
	drivers/staging/prima/CORE/WDI/DP/src/wlan_qct_wdi_bd.c
	drivers/staging/prima/CORE/WDI/DP/src/wlan_qct_wdi_ds.c
	drivers/staging/prima/CORE/WDI/TRP/CTS/inc/wlan_qct_wdi_cts.h
	drivers/staging/prima/CORE/WDI/TRP/CTS/src/wlan_qct_wdi_cts.c
	drivers/staging/prima/CORE/WDI/TRP/DTS/inc/wlan_qct_wdi_dts.h
	drivers/staging/prima/CORE/WDI/TRP/DTS/src/wlan_qct_wdi_dts.c
	drivers/staging/prima/CORE/WDI/WPAL/inc/wlan_qct_os_list.h
	drivers/staging/prima/CORE/WDI/WPAL/inc/wlan_qct_os_status.h
	drivers/staging/prima/CORE/WDI/WPAL/inc/wlan_qct_os_sync.h
	drivers/staging/prima/CORE/WDI/WPAL/inc/wlan_qct_os_timer.h
	drivers/staging/prima/CORE/WDI/WPAL/inc/wlan_qct_os_trace.h
	drivers/staging/prima/CORE/WDI/WPAL/inc/wlan_qct_os_type.h
	drivers/staging/prima/CORE/WDI/WPAL/inc/wlan_qct_pack_align.h
	drivers/staging/prima/CORE/WDI/WPAL/inc/wlan_qct_pal_api.h
	drivers/staging/prima/CORE/WDI/WPAL/inc/wlan_qct_pal_device.h
	drivers/staging/prima/CORE/WDI/WPAL/inc/wlan_qct_pal_list.h
	drivers/staging/prima/CORE/WDI/WPAL/inc/wlan_qct_pal_msg.h
	drivers/staging/prima/CORE/WDI/WPAL/inc/wlan_qct_pal_packet.h
	drivers/staging/prima/CORE/WDI/WPAL/inc/wlan_qct_pal_status.h
	drivers/staging/prima/CORE/WDI/WPAL/inc/wlan_qct_pal_sync.h
	drivers/staging/prima/CORE/WDI/WPAL/inc/wlan_qct_pal_timer.h
	drivers/staging/prima/CORE/WDI/WPAL/inc/wlan_qct_pal_trace.h
	drivers/staging/prima/CORE/WDI/WPAL/inc/wlan_qct_pal_type.h
	drivers/staging/prima/CORE/WDI/WPAL/src/wlan_qct_pal_api.c
	drivers/staging/prima/CORE/WDI/WPAL/src/wlan_qct_pal_device.c
	drivers/staging/prima/CORE/WDI/WPAL/src/wlan_qct_pal_msg.c
	drivers/staging/prima/CORE/WDI/WPAL/src/wlan_qct_pal_packet.c
	drivers/staging/prima/CORE/WDI/WPAL/src/wlan_qct_pal_sync.c
	drivers/staging/prima/CORE/WDI/WPAL/src/wlan_qct_pal_timer.c
	drivers/staging/prima/CORE/WDI/WPAL/src/wlan_qct_pal_trace.c
	drivers/staging/prima/Kconfig
	drivers/staging/prima/riva/inc/halCompiler.h
	drivers/staging/prima/riva/inc/halLegacyPalTypes.h
	drivers/staging/prima/riva/inc/pttFrameGen.h
	drivers/staging/prima/riva/inc/pttModule.h
	drivers/staging/prima/riva/inc/pttMsgApi.h
	drivers/staging/prima/riva/inc/wlan_hal_cfg.h
	drivers/staging/prima/riva/inc/wlan_hal_msg.h
	drivers/staging/prima/riva/inc/wlan_nv.h
	drivers/staging/prima/riva/inc/wlan_phy.h
	drivers/staging/prima/riva/inc/wlan_qct_dev_defs.h
	drivers/staging/prima/riva/inc/wlan_status_code.h
	include/linux/nl80211.h
	include/linux/wcnss_wlan.h
	include/net/cfg80211.h
Revert "Add prima driver from CM11 MAKO kernel"

This reverts commit 9be6c62034d771115c0981aaa5f975f7276c1af2.
Enable power saving features
Commpiler optimizations
Reduce buffer slightly to clear compile-time warning
msm: krait: add CPU Voltage control.

Signed-off-by: Francisco Franco <franciscofranco.1990@gmail.com>

(edited for Samsung kernel by Motorhead1991)
lib/memcopy: use glibc version

the kernel's memcpy and memmove is very inefficient. But the glibc version is
quite fast, in some cases it is 10 times faster than the kernel version. So I
introduce some memory copy macros and functions of the glibc to improve the
kernel version's performance.

The strategy of the memory functions is:
1. Copy bytes until the destination pointer is aligned.
2. Copy words in unrolled loops.  If the source and destination are not
   aligned in the same way, use word memory operations, but shift and merge
   two read words before writing.
3. Copy the few remaining bytes.

Signed-off-by: Miao Xie <miaox*******>
Signed-off-by: faux123 <reioux@gmail.com>

Conflicts:

	lib/Makefile
lib/string: use glibc version

the performance of memcpy and memmove of the general version is very
inefficient, this patch improved them.

Signed-off-by: Miao Xie <miaox*******>
Signed-off-by: faux123 <reioux@gmail.com>

Conflicts:

	lib/string.c
ext4: fix memory leak in xattr

If we take the 2nd retry path in ext4_expand_extra_isize_ea, we
potentionally return from the function without having freed these
allocations.  If we don't do the return, we over-write the previous
allocation pointers, so we leak either way.

Spotted with Coverity.

[ Fixed by tytso to set is and bs to NULL after freeing these
  pointers, in case in the retry loop we later end up triggering an
  error causing a jump to cleanup, at which point we could have a double
  free bug. -- Ted ]

Change-Id: I49b8ca41a6c6d44b563eb23306870258a3affd3b
Signed-off-by: Dave Jones <davej@fedoraproject.org>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Cc: stable@vger.kernel.org
Git-commit: 6e4ea8e33b2057b85d75175dd89b93f5e26de3bc
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Signed-off-by: Osvaldo Banuelos <osvaldob@codeaurora.org>
msm-sleeper

Signed-off-by: flar2 <asegaert@gmail.com>
Update msm-sleeper and add sysfs entry for maxscreenoff

Signed-off-by: flar2 <asegaert@gmail.com>
fastcharge: initial adaptation for HTC One

Signed-off-by: Paul Reioux <reioux@gmail.com>
Signed-off-by: flar2 <asegaert@gmail.com>
Enable strict aliasing and redirect toolchain path
Fix mach-msm/Makefile for fast_chg and msm_sleeper
Fix compile-time typo
intelli_plug: intelligent hotplug cpu driver with eco mode

Signed-off-by: faux123 <reioux@gmail.com>

Conflicts:
	arch/arm/mach-msm/Kconfig
intelli_plug: tweak for faster wakeup from suspend

bump version to 1.1

Signed-off-by: faux123 <reioux@gmail.com>
intelli_plug: increase cores on persistence

also replace hardcoded values with Macros for ease of updating later

Signed-off-by: faux123 <reioux@gmail.com>
intelli_plug: another performance tweak for better UI response

Signed-off-by: faux123 <reioux@gmail.com>
intelli_plug: make it gcc-4.6.x eabi compatible :p

Signed-off-by: faux123 <reioux@gmail.com>