am 355013da: Merge "enable WAITFORVSYNC"

* commit '355013dad004a0a553ed11dda134b02353107f40':
  enable WAITFORVSYNC
merge in ics-mr1-release history after reset to ics-mr1
merge in jb-release history after reset to master
merge in ics-mr1-release history after reset to ics-mr1
Reconcile with ics-mr1-release

Change-Id: Ic91d3c882c877bac3fa3c26ab62d6c68e2ade8d4
Reconcile with ics-mr1-release

Change-Id: I1f3e9deedb5389b76e36f1d001bfa818a1a7c71e
am 6caac183: Reconcile with ics-mr1-release

* commit '6caac18330c194a83ea01de674b12c64c86d48c4':
am 6c46555e: am 6caac183: Reconcile with ics-mr1-release

* commit '6c46555ed4f2546af293972b975611b763b15487':
am a0c746cb: Reconcile with ics-mr1-release

* commit 'a0c746cb84af832f84c207f09041293c1e3fc84a':
am db25239d: am a0c746cb: Reconcile with ics-mr1-release

* commit 'db25239da1ce76330fab81813528dd15eab04dbb':
am 42f89513: am db25239d: am a0c746cb: Reconcile with ics-mr1-release

* commit '42f89513d0cf2682aff43c9ea3a2a8bf8fef7d89':
tuna: Kernel prebuilt

c958ae4 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0
ea0a189 Merge branch 'linux-omap-3.0' into android-omap-3.0
0990bd3 Merge branch 'android-3.0' into android-omap-3.0
9e95bb9 ASoC: omap-mcasp: Relax S/PDIF clocks/frame constraint
dfe2d23 ASoC: twl6040: Configure PLL during hw_params
3a1d3e8 ASoC: core: Remove DAI link pre/post ops
46e4518 ASoC: SDP4430: Enable/disable TWL6040 in startup/shutdown ops
76926a0 ASoC: core: Promote DAI link startup
92f7002 ASoC: twl6040: Use single set of PLL ids
a3fd6da ASoC: twl6040: Remove invalid LP constraints
077c85b ASoC: core: Query active DAI links
1d363fe ASoC: DSP: Clear BE runtime in startup unwind
a9f0191 OMAP4: Tuna: Move TWL6040 CLK32K handling to pdata
1f8c5ce Input: evdev - fix variable initialisation
4dc43d7 Input: evdev - Add ioctl to block suspend while event queue is not empty7cc8460 Input: evdev - Don't hold wakelock when no data is available to user-space
0e80804 net: wireless: bcmdhd: Increase pm_notify callback priority
dfc896e net: wireless: bcmdhd: Fix crash on dhdsdio_probe_attach() failure
256a6b2 net: wireless: bcmdhd: Daemonize wl_event_handler
ff93146 net: wireless: bcmdhd: Update to Version 5.90.195.23
96034c2 net: wireless: bcmdhd: Update to Version 5.90.195.22
494661a net: wireless: bcmdhd: Update to Version 5.90.195.19
1dddb0c net: wireless: bcmdhd: Update to Version 5.90.195.15
52bdb6f net: wireless: bcmdhd: Add WIPHY_FLAG_SUPPORTS_FW_ROAM flag
b1a9420 net: wireless: bcmdhd: Fake PNO event to wake up the wpa_supplicant
e41260a serial: omap: disable serial port irq during suspend
6739128 ARM: omap: sched_clock: Don't let sched_clock tick during suspend
09701e3 usb: gadget: android: Honor CONFIG_USB_GADGET_VBUS_DRAW
a6ccb73 usb: gadget: Fix usb string id allocation
87159de nl80211/cfg80211: Make addition of new sinfo fields safer
d692df2 cfg80211/nl80211: Send AssocReq IEs to user space in AP mode
d1e9413 misc: remove android pmem driver, it's obsolete.
dac306d Revert "proc: enable writing to /proc/pid/mem"

Change-Id: Ic063215a0738afc6b758f22a63df646f84bbec1b
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
am ea632a6c: tuna: Kernel prebuilt

* commit 'ea632a6c0ff7b989d2d2bce263eb9cffa0b29422':
  tuna: Kernel prebuilt
merge in jb-release history after reset to master
Reduce NFC-DEP target timeout in ATR_RES to 8.

This is actually required by [DIGITAL], see WTmax
in Appendix A.10 in Digital 1.0

Bug: 5971998
Change-Id: If25e887d80e3cdfd48b112453b187c38f4ceeeaa
Merge "Reduce NFC-DEP target timeout in ATR_RES to 8."
am 6be840e9: Merge "Reduce NFC-DEP target timeout in ATR_RES to 8."

* commit '6be840e95975e641615ddd35d76f73c89fd96b69':
  Reduce NFC-DEP target timeout in ATR_RES to 8.
egl.cfg can now only have a single entry

Change-Id: Id10da961c4f5036225a3aab41ccb700d8b2de4ca
merge in jb-release history after reset to master
Add support for concurrent operation

Change-Id: I433cbc664c863d8770dfe4a581b70bb72e4eddff