Merge "ARM: dts: msm: add use SW algo flags in qcrypto driver on 8974"
Merge "ARM: dts: msm: add clock management flag for qcrypto driver on 8974"
Merge "ipv6: introdcue __ipv6_addr_needs_scope_id and ipv6_iface_scope_id helper functions"
Merge "net: ipv6: Add IPv6 support to the ping socket."
Merge "net: ipv6: add missing lock in ping_v6_sendmsg"
Merge "net: ipv6: fix wrong ping_v6_sendmsg return value"
Merge "ARM: dts: msm: support qseecom bus scaling in msm8974"
Merge "ARM: dts: msm: support qseecom bus scaling in msm8226"
ARM: dts: msm: changes for Liquid P3.1 APQ with HSIC QCA

Due to QCA6234 needs 3.3v/1.8v(L19/L10) output, overwrite the
default settings of L19 and L10.

CRs-Fixed: 611712
Change-Id: Idfd84a17ba2b533e7aee14037ce3bb8d05779326
Signed-off-by: Ming-yi Lin <mylin@codeaurora.org>
Merge "lib/scatterlist: error handling in __sg_alloc_table()"
regulatory: use correct regulatory initiator on wiphy register

The current regdomain was not always set by the core. This causes
cards with a custom regulatory domain to ignore user initiated changes
if done before the card was registered.

Signed-off-by: Arik Nemtsov <arik@wizery.com>
Acked-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Git-commit: 23df0b731954502a9391e739b92927cee4360343
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
CRs-Fixed: 569424
Change-Id: Ia5462145a27f5ecdd7a1eb9f4235992f7a801097
[smihir@codeaurora.org: changes to merge cleanly in older kernel]
Signed-off-by: Mihir Shete <smihir@codeaurora.org>
Merge "msm: cpufreq: Correct synchronous cpu logic"
msm: lpm_levels: return new idle level to cpuidle framework

Need to return the new idle level to cpuidle framework
but just returned input value argument 'index' which is
not used actually at lpm_cpu_power_select().

CRs-fixed: 601636
Change-Id: Iabd182eeb4fbdc67f4e07b40a1b593471cf8cbdf
Signed-off-by: Anil kumar mamidala <amami@codeaurora.org>
ASoC: msm: Add check for both offset and index variable

-The offset and index variable may leads to array out of
boundary exception.
-Added offset and index overflow check.

Change-Id: I1f71ee595944573e85d77d2001f656bd8ba53806
CRs-fixed: 583931
Signed-off-by: Mohammad Johny Shaik <mjshai@codeaurora.org>
msm: vidc: Provide qmenu for V4L2_CID_MPEG_VIDC_VIDEO_INTRA_REFRESH_MODE

The v4l2 control framework requires a qmenu containing a string
description of each menu item.

Change-Id: Id41fd794a6f7ad8711caf9d072975ad6cabad6f9
Signed-off-by: Deva Ramasubramanian <dramasub@codeaurora.org>
input: touchscreen: Replace macros used inside the functions

Replace the macros that are used inside the driver function
with dtsi entries.
Remove hrtimer calls which is not being used in the current
driver code.

Change-Id: I29b9ea41df467d0092be8005733016843dc26f60
Signed-off-by: Shantanu Jain <shjain@codeaurora.org>
power: qpnp-charger: only apply ibat-loop fix when battery is present

An issue was observed where the device could continuously reset when
the battery pins are left floating and the ibat-loop was disabled.

Fix this by only applying the ibat-loop workaround when the device has
a battery present.

Change-Id: I273b8fe3dc3c99e9bbb619e8e15abfd4c298366e
Signed-off-by: Xiaozhe Shi <xiaozhes@codeaurora.org>
ASoC: msm: qdsp6v2: Add upper bounds check on index

Add upper bounds check for return value of
q6audio_get_port_index().

CRs-Fixed: 575227
Change-Id: I263fc6d759beffd2c2fecc7794c279939ab25401
Signed-off-by: Kenneth Westfield <kwestfie@codeaurora.org>
ASoC: msm: qdsp6v2: Check for null pointers

Add check for null data pointer in
adm_callback() and log error message if
true.

CRs-Fixed: 575222
Change-Id: I88a4d19cc2e78610249e404bce93831557995fab
Signed-off-by: Kenneth Westfield <kwestfie@codeaurora.org>
Merge "ARM: dts: msm: move external power supply configuration for msm8926-v2"