staging: prima: Merge caf/LA.AF.1.1_rb1.7

Merge "wlan: Ignore PNO indication if the channel is not valid for CC."
Merge "wlan: Handle TX queues timeout when deauth come during ADD STA REQ"
Merge "wlan: Added the gEnableDFSPnoChnlScan ini parameter"
Merge "wlan: Do DEL_STA if driver gets deauth during ADD_STA."
wlan: Added the gEnableDFSPnoChnlScan ini parameter
Merge "wlan: Minimizing the retry log for Re/Assoc Rsp frame."
Merge "wlan: Address kernel panic due to invalid memory access"
Merge "wlan: Assign callback to resume TX if secondary channel is changed."
Merge "wlan: validate the driver status during interface down"
wlan: Address kernel panic due to invalid memory access
wlan: Assign callback to resume TX if secondary channel is changed.
Merge "wlan: PMF: Fix to delete pmfSaQueryTimer during SubSystemRestart"
Merge "wlan: logpinprogress wrongly set during SSR"
Merge "wlan: Validate hdd context before processing an IOCTL."
Merge "wlan:Clear the wmmAcSetupImplicitQos work in case of implicit AC mechanism."
Merge "wlan: Avoid watchdog bark due to excessive logging"
Merge "wlan: Add check for adapter MAGIC to avoid crash in rx_packet_cbk"
Merge "wlan: wdi: wpal: ratelimit invalid register read"
wlan: Validate hdd context before processing an IOCTL.
wlan: Add check for adapter MAGIC to avoid crash in rx_packet_cbk
wlan:Clear the wmmAcSetupImplicitQos work in case of implicit
wlan: Avoid watchdog bark due to excessive logging
wlan: PMF: Fix to delete pmfSaQueryTimer during SubSystemRestart
wlan: logpinprogress wrongly set during SSR
wlan: wdi: wpal: ratelimit invalid register read

Change-Id: Iccb708042b5ba680b5338992a2393f081eadf70d
drivers: input: Add BMA250 ONLY G-sensor Driver

Signed-off-by: Brinly Taylor <uberlaggydarwin@gmail.com>

Change-Id: I3c71068c62e71387bfa520d23d8f9ae14709d58b
drivers: regulators: Add NCP6924 driver

Signed-off-by: Brinly Taylor <uberlaggydarwin@gmail.com>

Change-Id: Ic40fa230d94d16823c1173c9912ca0aa07bec204
drivers: media: video: Add omnivision5693 sensor

Signed-off-by: Brinly Taylor <uberlaggydarwin@gmail.com>

Change-Id: I951dbc8d333ff5f24133048b0435e3e9ebab11f3
Merge CyanogenMod/cm-12.0 into cm-12.0