Merge "msm: display: Fix composition issues when framework rebooted in suspend."
Revert "msm: kgsl: Squashed update from msm-3.4"

 * There are still issues with the latest drivers supplied by Qualcomm,
   so rollback for now until we have a better version.

This reverts commit bd7065af2b81f138f3795c90e914d6c7374269e7.
Merge tag 'AU_LINUX_ANDROID_JB_2.5.04.02.02.40.242' of git://codeaurora.org/kernel/msm into cm-10.1

AU_LINUX_ANDROID_JB_2.5.04.02.02.40.242 based on quic/aosp/jb_2.5
cpufreq: interactive: Fix uninitialized spinlock

Change-Id: I9959669e0f643ccd2bd1072fae440d8c20f1c9cc
Merge tag 'AU_LINUX_ANDROID_JB_2.5.04.02.02.40.243' of git://codeaurora.org/kernel/msm into cm-10.1

AU_LINUX_ANDROID_JB_2.5.04.02.02.40.243 based on quic/aosp/jb_2.5
msm: Add support for debuglevel

Change-Id: I3c2c62012e4a463c10631c4ed6f267a744b56341
Revert "M2: regulators: fixup: make RPM_VREG_ID_PM8921_S2 regulator sleep_selectable"

 * This is causing high power drain and instability.

This reverts commit 298d95f32f9d28f42fab9444e5bcc2db5b0ccb2b.

Change-Id: Ia4ee3ff562fa0bd93dd7699eb74a60c89a9603bd
Merge "msm: display: fix iommu page faults for devices with lcdc panel."
msm: thermal: Use signed int for temperature

Temperatures could be in negative and negative signed ints may be
incorrectly read as unsigned int.

Change-Id: I817db2756c54816296a700ffcd004a83161f2b95
CRs-Fixed: 441632, 473507
Signed-off-by: Praveen Chidambaram <pchidamb@codeaurora.org>
Merge "radio-tavarua: Handle I2C read/write errors during sleep mode."
Merge "radio: iris: Add synchronize mechanism to handle multiple command requests"
media: dvb: Discard sections TS packets with transport error indicator

Corrupted section data should not be notified to the application,
TS packets holding sections with transport error indicator (TEI)
are discarded.

CRs-Fixed: 473875
Change-Id: I43f500a8cde86ad970360a7f1b50615f16fb7a89
Signed-off-by: Hamad Kadmany <hkadmany@codeaurora.org>
Merge tag 'AU_LINUX_ANDROID_JB_2.5.04.02.02.040.250' of git://codeaurora.org/kernel/msm into cm-10.1

AU_LINUX_ANDROID_JB_2.5.04.02.02.040.250 based on quic/aosp/jb_2.5
d2: clean up logspam
bcmdhd: Enable Ad-Hoc (IBSS) mode

Enable Ad-Hoc (IBSS) mode for bcmdhd. We basically just need to set the
interface flag and avoid some P2P specific settings while scanning.

Also add the "station get" command for IBSS mode.

Change-Id: Ie6f0fa77b55d92a7c22cbda72bad200cbfaede04
Signed-off-by: Bruno Randolf <br1@einfach.org>
Linux 3.4.40
Signed-off-by: task650 <task650@gmail.com>
fs: Add missing try_to_freeze call
mmc: core: Fix some driver hangs when dealing with broken devices

There are infinite loops in the mmc code that can be caused by bad
hardware.  The code will loop forever if the device never comes back
from program mode, R1_STATE_PRG, and it is not ready for data,
R1_READY_FOR_DATA.

A long timeout is added to prevent the code from looping forever.
The timeout will occur if the device never comes back from program
state or the device never becomes ready for data.

It's not clear whether the timeout will do more than log a pr_err()
and then start a fresh hang all over again.  We may need to extend
this patch later to perform some kind of reset of the device (is
that possible?) or rejection of new I/O to the device.

Change-Id: I1f3e5fddffb5134743fbfbcdef5e97803fd25fc6
Signed-off-by: Trey Ramsay <tramsay@linux.vnet.ibm.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org>
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>

Conflicts:

	drivers/mmc/core/core.c

Signed-off-by: task650 <task650@gmail.com>
Prevent 384 MHz from being used