Update for lollipop

Change-Id: Iccd4cab707d52afcf759a14f58669a1c1caea5d3

Conflicts:
	arch/arm/configs/cm_fusion3_dogo_defconfig
	drivers/staging/android/binder.c
	scripts/gcc-wrapper.py
Merge Sony 10.5.1.A.0.283

Conflicts:
	arch/arm/configs/msm8960_defconfig

Change-Id: I5e39a87a7a15a4fe1233259703916ac8562d3a16
Revert "drop gcc wrapper"

This reverts commit 05e3f8bf3328e857a7d1f4178c75aa44021db34c.
Update gcc-wrapper

Change-Id: I0357680566d16c7d9da9d9df6031f242ced6067f
net: add a sysctl to reflect the fwmark on replies

Kernel-originated IP packets that have no user socket associated
with them (e.g., ICMP errors and echo replies, TCP RSTs, etc.)
are emitted with a mark of zero. Add a sysctl to make them have
the same mark as the packet they are replying to.

This allows an administrator that wishes to do so to use
mark-based routing, firewalling, etc. for these replies by
marking the original packets inbound.

Tested using user-mode linux:
 - ICMP/ICMPv6 echo replies and errors.
 - TCP RST packets (IPv4 and IPv6).

Change-Id: I95d896647b278d092ef331d1377b959da1deb042
Signed-off-by: Lorenzo Colitti <lorenzo@google.com>
nf: IDLETIMER: time-stamp and suspend/resume handling.

Message notifications contains an additional timestamp field in nano seconds.
The expiry time for the timers are modified during suspend/resume.
If timer was supposed to expire while the system is suspended then a
notification is sent when it resumes with the timestamp of the scheduled expiry.

Removes the race condition for multiple work scheduled.

Bug: 13247811

Change-Id: I752c5b00225fe7085482819f975cc0eb5af89bff
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
fusion3: enable NETFILTER_XT_TARGET_IDLETIMER

Change-Id: I00b506ff7cc058c9386209b9ab6221cec0373009
msm: mdp: Update sync pt. behaviour

Add a retire fence and clean up the existing release fence
implementation

Signed-off-by: Naseer Ahmed <naseer@codeaurora.org>
Change-Id: Iecf7e95d0786ac43aa6a12d70442936600c0249a
ALSA: compress: add support for gapless playback

this add new API for sound compress to support gapless playback.
As noted in Documentation change, we add API to send metadata of encoder and
padding delay to DSP. Also add API for indicating EOF and switching to
subsequent track

Also bump the compress API version

Conflicts:
	include/uapi/sound/compress_offload.h

Signed-off-by: Jeeja KP <jeeja.kp@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

Conflicts:

	include/sound/compress_offload.h

Change-Id: I62de413012796d61455f0ef484703d8b096f59c5
Signed-off-by: Krishnankutty Kolathappilly <kkolat@codeaurora.org>
Revert "ASoC: msm: Flexible period size for pcm playback"

This reverts commit 9183ff0a90d82939033563b9e6a15fc091c76ea5.
Adjust PLAYBACK_PERIOD_SIZE
This now agrees on what is defined in the HAL.
Without this, NuPlayer will sometimes behave strange and fail to fill up the buffer (while jerking the video playback)

Conflicts:
	sound/soc/msm/msm-pcm-q6.c

Change-Id: If8879a56052ce9efd56529602d3d48878191cbae
Import CRYPTO_AES_ARM from googles 3.14 branch

Conflicts:
	arch/arm/configs/fusion3_yuga_defconfig

Change-Id: I29737aedf9d048f7297d498d71497e96a4fcf225