Merge "Merge "msm: socinfo: Add support for socinfo v9""
Merge "Merge "Merge "msm: socinfo: Add support for socinfo v9"""
Merge "Merge "msm: socinfo: Add support for socinfo v9""
Merge "Merge "Merge "msm: socinfo: Add support for socinfo v9"""
Merge "Merge "msm: socinfo: Add support for socinfo v9""
rtc: qpnp-rtc: Set alarm control register properly

RTC Alarm enable bit does not get conserved during
RTC probe function. This patch fixes that issue.

CRs-Fixed: 636652
Change-Id: I28203b8e301510d34d2e726c0bd25e78737f7524
Signed-off-by: Mohit Aggarwal <maggarwa@codeaurora.org>
Merge "Merge "Merge "msm: socinfo: Add support for socinfo v9"""
Merge "Merge "rtc: alarm: update power_on alarm setting logic""
Merge "Merge "Merge "rtc: alarm: update power_on alarm setting logic"""
Merge "Merge "msm: vidc: Free OCMEM during power collapse""
Merge "Merge "Merge "msm: vidc: Free OCMEM during power collapse"""
Merge "Merge "mdss: mdp3: Group together resource enable, simplifying xo shutdown""
Merge "Merge "Merge "mdss: mdp3: Group together resource enable, simplifying xo shutdown"""
Merge "Merge "msm: mdss: indicate splash screen condition explicitly""
Merge "Merge "Merge "msm: mdss: indicate splash screen condition explicitly"""
Merge "Merge "msm: mdss: indicate splash screen condition explicitly""
Merge "Merge "Merge "msm: mdss: indicate splash screen condition explicitly"""
msm: ultrasound: add support for aDSP Sub-System Restart

Add handling of RESET_EVENTS message from APR, which indicates
aDSP sub-system restart has begun.

Add a new internal state, USF_ADSP_RESTART_STATE, for this
scenario.

Change-Id: Ic1178f8fb4e659abc29947fac4079ba088e51447
Signed-off-by: Lior Barenboim <liorb@codeaurora.org>
ARM: Improve vmalloc address checking in show_data()

There is an unhandled corner case with the current check
which has recently been hit. The nbytes argument may be
large enough for the range being dumped to cross a
boundary between page-table mappings, and dump addresses
which are vmalloc'd in the neighboring mapping.

Check every address being dumped to see if its vmalloc'd,
not just the address passed to show_data().

CRs-Fixed: 625442
Change-Id: I255b093808177321f5202dcacea337ee333bfc63
Signed-off-by: Matt Wagantall <mattw@codeaurora.org>
Merge "Merge "lib/scatterlist: error handling in __sg_alloc_table()""