Ancora panel uses different clk table
Revert "msm_fb: display: Enable MDP clock's overlay block during panel on"

This reverts commit 2cc0d3507ded8d9f4e93bb5de27276049b2725e3.
Revert "msm_fb: display: Bring back previously left out code from the bulk update"

This reverts commit 2d960c12c8c858b38b6963d5db598d1d4df97ce7.
Revert "serial: msm_serial_hs: Use bcm_bt_lpm for low power mode"

This reverts commit 7d3601124301a825ce6bea73e39d4ad7c9cb9a0e.
msm: sdio: when entering error state printing sdio_al info

When entering error state or when issuing a write command through shell,
printing out and into a file all sdio_al devices and channels
info for further debugging.

(cherry picked from commits 78b6fc34e91308c77d06f30c915b07ed33c08f0f ,
214875e30ba4405815065de8ec945b5c717e90a3,
dac02e6ccc0abe863f212d797bcf5f9bc12cc1fb,
2af49f2bfc45bee6a74b8f01d2275b063e959968,
a353f8b2677030eecd1ffc4b474bef1dc332a5e8,
eedf47a5b9d96b18636c94d3981b567f667e5aa5,
281399a429f9434d817344c7377f7e4547d44855)

CRs-Fixed: 301439
Change-Id: Ibc1935c1647b82981e861da4a9e21f806e682107
Signed-off-by: Maya Erez <merez@codeaurora.org>
msm: sdio: fix MCI_CLK corruption

when sdio_al calls set_pwrsave at the end of sdio_al_sleep
the following scenario can happen:
if between the reading of MCI_CLK and the writing of
MCI_CLK we got an interrupt from the modem, the msm_sdcc
irq handler will turn on the clocks.
set_pwrsave and msmsdcc_platform_sdiowakeup_irq
have no protection between them so set_pwrsave
will write a corrupted value

(cherry-picked from commit
483f77e3b00ad33896ebdf374ae4072db39b68a9)
Signed-off-by: Maya Erez <merez@codeaurora.org>

CRs-fixed: 300739
Change-Id: I18417b570c21551974f5515c05ef96cb12fe2389
Signed-off-by: Maya Erez <merez@codeaurora.org>
ASoC: msm7x30: add mixer control to mute/unmute record device

The current device volume 0 is not absolute mute. Add support to
mute/unmute device. Support only Capture path.

Change-Id: I1c84874f93b50540408e0ce9d5807c5bb711d826
Signed-off-by: Y Mehta <ymehta@codeaurora.org>
mmc: msm_sdcc: Fix issue with msmsdcc_enable()

Due to the recent commit 68338b, any pending runtime PM
work (runtime suspend/resume request) is not getting
cancelled before enabling the host for a new request.
This results in a possibility for suspend work to happen
in parallel while processing any active SD/MMC command.

Change-Id: I8db6c53480ad9c9bac972b4cb16ea2bc248a790f
CRs-fixed: 305399
Signed-off-by: Sahitya Tummala <stummala@codeaurora.org>
mmc: msm_sdcc: Extend the spin lock to cover all register reads

In PIO IRQ handler, currently the STATUS and MASK registers are
read without the host lock being grabbed. Fix this by extending
the scope of the lock.

CRs-Fixed: 304791
Signed-off-by: Murali Palnati <palnatim@codeaurora.org>
(cherry picked from commit 78bbcac0ddb9a0e979cd45734bdaaee7714c31d4)

Change-Id: I25add6a04b94383515ebffa49bdefba2cbe21666
Signed-off-by: Raj Kushwaha <rajk@codeaurora.org>
Signed-off-by: Gopal G Goberu <ggober@codeaurora.org>
(cherry picked from commit a9e1d1ad63af8845ae5cc957587808bf9d2843ae)

Signed-off-by: Gopal G Goberu <ggober@codeaurora.org>
drivers: rtc-pm8058: Fix automatic wakeup of APPS due to RTC alarm.

Alarm interrupt causes automatic wakeup even when the phone is in
powerdown state.

CRs-Fixed: 286086
Change-Id: I9dedacc4cc004d622bb821b1134c0ab86cbbb317
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Signed-off-by: Gopal G Goberu <ggober@codeaurora.org>
(cherry picked from commit 98abaa84faada77ff838221c85d339fb52fbe9f5)

Signed-off-by: Gopal G Goberu <ggober@codeaurora.org>
arm: mm: Exclude additional mem_map entries from free

A previous patch addressed the issue of move_freepages_block()
trampling on erronously freed mem_map entries for the bank end
pfn. We also need to restrict the start pfn in a
complementary manner.

Also make macro usage consistent by adopting the use of
round_down and round_up.

CRs-fixed: 339813
Signed-off-by: Michael Bohan <mbohan@codeaurora.org>
(cherry picked from commit 3a99a03af19781dcf1074e70461505e2d773bba1)

Change-Id: I5c5d1e0ec90a6b4fc283474a5c033abbada38402
Signed-off-by: Srivalli Oguri <oguri@codeaurora.org>
usb: gadget: Fix USB tethering
Update defconfigs
Initial Support for BLN (taken from aries kernel)
Touchkey: don't disable touchkey if there's a BLN active
vidc: 1080p : Add support for slice delivery mode to encoder

    Slice delivery mode enables confguring the encoder to deliver
    one slice per output buffer. This mode is valid only for h264
    codec when multi slice config is set to slice by mb.

Credits: Pradnya Chaphekar <pradnyac@codeaurora.org>
vidc: 1080p : Add support for skip frame in slice delivery mode

    Slice delivery mode for H264 encoder will deliver constant number of
    output slice buffers for each frame. In case of CBR rate control method,
    core will skip frames to maintain the output quality, in which case
    driver need to send out the output buffers with data length as zero
    for skipped frame output type from the core.

Credits: Maheshwar Ajja <majja@codeaurora.org>
Merge remote-tracking branch 'ivendor-samsung-kernel-msm7x30/ics' into ics

Conflicts:
	drivers/input/keyboard/cypress-touchkey.c