Merge "Merge "ASoC: msm: qdsp6v2: Propagate device HW delay to AFE.""
Merge "Merge "Merge "ASoC: msm: qdsp6v2: Propagate device HW delay to AFE."""
Merge "Merge "ASoC: msm: qdsp6v2: Propagate device HW delay to AFE.""
Merge "Merge "Merge "ASoC: msm: qdsp6v2: Propagate device HW delay to AFE."""
Merge "Merge "net: rmnet_usb: Add support for aligned QOS header""
Merge "Merge "Merge "net: rmnet_usb: Add support for aligned QOS header"""
wlan: Userspace data copy fix

Use copy_to_user and copy_from_user for
copying data to/from user space.

Change-Id: I07ed5361b439f4bcd61bbf693cc17c950f5b2660
CRs-Fixed: 561022
wlan:Revision 3.2.7.14

Revision 3.2.7.14

Change-Id: Icf623b7855bc98b5640b4fe49f6af72c3c6d14d0
DroidSec: Check sscanf returns in function iw_set_priv

In the two clauses "powermode" and "CONFIG-TX-TRACKING",
it should be confirmed that cmd_len is greater than amount
incrementing cmd when form ptr,and must check return from
sscanf to confirm that parameters were parsed correctly
before subsequent use.

Change-Id: I9e93c3f34b116f6fac1bd81f32956fb88cba807a
CRs-fixed: 554538
Merge "wlan: Userspace data copy fix"
Merge "wlan:Revision 3.2.7.14"
Merge "DroidSec: Check sscanf returns in function iw_set_priv"
Merge AU_LINUX_ANDROID_KK_2.7_RB1.04.04.01.007.022 on remote branch

Change-Id: I22ceea8da07e97345eb598690a200487bcdc9108
Merge "Merge AU_LINUX_ANDROID_KK_2.7_RB1.04.04.01.007.022 on remote branch"
Merge Moto X 4.4 source for 13.11.3Q2.X-69-3-2

Change-Id: I6cc0cb6aa65d237c3f0cd384ce419511d3d3bc2e
Revert "inet: prevent leakage of uninitialized memory to user in recv syscalls"

This reverts commit 11afb94fbe0337a06ee7fce36841969b4e538622.
Revert "inet: fix addr_len/msg->msg_namelen assignment in recv_error and rxpmtu functions"

This reverts commit ad25b5df02bacf27efb56fe12bb8da8dd9273546.
Revert "Revert "net: ipv6: Add IPv6 support to the ping socket.""

This reverts commit ce9e56961ad6ab663b49b0ee5c213a62097ebcf8.
Revert "Revert "ping: always initialize ->sin6_scope_id and ->sin6_flowinfo""

This reverts commit a7cb95c01e34c8d27d837b3071a56ebc20f8df6b.
Merge remote-tracking branch 'caf/kk_2.7.1' into cm-11.0