prima: add apex and express to build barrier for firmware

Change-Id: I4d99c8534f06330e2457492ebe20c163c4818f0f
Merge "prima: add apex and express to build barrier for firmware" into cm-11.0
Revert "ALSA: fix oops in snd_pcm_info() caused by ASoC DPCM"

This reverts commit 5812381adfde20cb352d3047190ab45ea5bb59f2.
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0-aeroevan
msm: mdm2: Add delay between subsequent PS_HOLD for 8930

This feature was previously added for the 8960 sglte target,
in commit 21274cf2219899ef9b46cf8b9fd8bf4ce52d057b, but it also
applies to the 8930 SGLTE target. The original commit message
follows.

During SSR first a reset of external modem is issued
and mdm_do_soft_power_on() toggles ap2mdm_soft_reset which
in turn toogles the PS_HOLD. Then a part of SSR external
modem is powered up and mdm_do_soft_power_on() again toggles
the gpio. For PMIC register stabilization we need a 1sec delay
between subsequent mdm_do_soft_power_on().
By default the delay is 500msec, so adding another 500msec for
stablization.

Change-Id: Ie114ebf0102dcfe071763add9028f09d07526f61
Signed-off-by: Ramesh Gupta Guntha <rggupt@codeaurora.org>
ARM: Use -mcpu=cortex-a15 when targeting MSM Krait CPUs

Enable compiler optimizations specific to the Cortex-A15
processor when targeting MSM Krait CPUs. This is necessary
take advantage of the UDIV/SDIV instructions supported by
these processors. To accomplish this, we need to remove the
-march=armv7-a ISA restriction from the compiler options
because 'cortex-a15' is a superset of 'armv7-a'.

Change-Id: I6215aecc11fb4f77c971de7b84f68649ef234357
Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org>
Merge branch 'cm-11.0-aeroevan' of https://github.com/aeroevan/android_kernel_samsung_d2 into fender-unstable-kk