merge in ics-mr1-release history after reset to ics-mr1
tuna: new kernel prebuilt

e00d9bd mmc: Set suspend/resume bus operations if CONFIG_PM_RUNTIME is used
d795e3c OMAP4: Clock: Put USB_DPLL in stop low power mode explicitly
1493e09 OMAP4: Clock: Correct OTG clock to use otg_60m_gfclk.

Change-Id: Ib2e5b7bf14f8f297d6953ee9b79c0141ff7075dc
Tool to fix the fs_size in the crypto footer

The GPT of HSPA Prime devices is incorrect when it comes from the factory.
Flashing a new bootloader fixes the GPT, but if the user had already
encrypted the device, the old size of the partition is recorded in the
crypto footer.  If the size if not updated, the device will not be able
to boot after the OTA, so add a new command to fix the fs_size field in
the crypto footer for Prime devices.

Change-Id: Ied4b592973d3d5c36c478b7fb32d59ac9e9611b0
tuna: update touch firmware to vers 0x65/0x45

0x65 is for rev3.2 touch panels, and 0x45 is for rev3.1

To resolve multi-touch issue,
   1. Added debounce algorithm on switching mode at noisy environment.
   2. Added hysteresis on rejecting events at noisy state, to prevent
      frequent drop of events and to improve usability.

Change-Id: I62791274bb5e59ef2cf3300977da205c9914aaee
am 726553e5: Tool to fix the fs_size in the crypto footer

* commit '726553e5ce617056aff3796ef320b76db245ee67':
  Tool to fix the fs_size in the crypto footer
Merge "tuna: update touch firmware to vers 0x65/0x45" into ics-mr1
merge in ics-mr1-release history after reset to ics-mr1
Move toro spr files to torospr.

This makes toro recovery visible to torospr.

Change-Id: I1de6e0d14c8e1642d1a1105612db72eddbb70508
tuna: prebuilt kernel -- DO NOT MERGE

8ebb62b usb: musb: Add a BUG_ON if trying to suspend musb in B_IDLE state
098e128 omap: dispc: force L3_2 CD to NOSLEEP when dispc module is active
0e4741f net: wireless: bcmdhd: Fix proper scan command even if request is NULL
8e56dbd net: wireless: bcmdhd: Fix scan crash in ibss mode
5e53345 power: max17040: do a sanity check in the fuel alert handler

Change-Id: Iaa5ec8b3cc4f8b57e9797a9f56ec2cd25192b832
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Merge "Move toro spr files to torospr." into ics-mr1
merge in ics-mr1-release history after reset to ics-mr1
Toro: USB: Add RNDIS+DM+MODEM

Add RNDIS+DM+MODEM for CP logging
1. Add USB composite setting for RNDIS+DM+MODEM
2. Change the permission for ttyGS0

Change-Id: Ifec615a33b7bb2c3e64098525f968a9026ff14c4
Signed-off-by: sujin119.kim <sujin119.kim@samsung.com>
tuna: add headset jack key layout files

Change-Id: Ic47caa03b2927f405784b25cbd550739f2d2daa9
Signed-off-by: Dima Zavin <dima@android.com>
Merge "tuna: add headset jack key layout files" into ics-mr1
tuna: prebuilt kernel -- DO NOT MERGE

3ace783 Revert "mmc: Set suspend/resume bus operations if CONFIG_PM_RUNTIME is used"
8716f56 omap4: tuna: Drop soft lockup detector timeout to 10 secs
159f17c OMAP3+: PM: VC: vcbypass needs to wait for valid to clear
655fddd OMAP4: PM: TPS6236x: speed up voltage rampup rate
37d2aca OMAP4: PM: TPS6236x: ensure rampdown occurs fast on shutdown
058ca02 OMAP4460: TWL6030: Setup VDD_core OFF voltage to retention voltage
3d57d92 OMAP4: PM: work around for CPU1 onlining from OFF/OSWR state on older PPA
0108824 OMAP4: TWL: ensure PREQ1 results in all active VCOREs to be down
7180250 OMAP4: HWMOD: UART1: disable smart-idle.
fdb7588 misc: fsa9480: don't enable FSA IRQ when VBUS IRQ is enabled
ce033dd ASoC: DSP: Split runtime startup/shutdown updates
a567f64 ASoC: dsp - BE disconnection after pending flag is clear
60f7431 misc: modem_if: link_mipi: Reset mipi phy when receive wrong packet
fc3549e usb: musb: Change BUG_ON to BUG to catch the issue as soon as it happens

Change-Id: Ic27e8bf5f08b6ac308a9aa26711da16d5e0cb6d6
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Merge "tuna: prebuilt kernel -- DO NOT MERGE" into ics-mr1
tuna: prebuilt kernel -- DO NOT MERGE

c553b5b OMAP4: Clock: Force a DPLL clkdm/pwrdm ON before a relock

Change-Id: I9631025af9090d374e641b7a4aebf36daac4e6a9
Signed-off-by: Todd Poynor <toddpoynor@google.com>
merge in ics-mr1-release history after reset to ics-mr1
tuna: prebuilt kernel -- DO NOT MERGE

6224f02 Revert "proc: enable writing to /proc/pid/mem"

Change-Id: Ia7000d5ca40ed4417e44d3470e0929763ce775a7
Signed-off-by: Dima Zavin <dima@android.com>
merge in ics-mr1-release history after reset to ics-mr1