OOM, PM: OOM killed task shouldn't escape PM suspend
Replace G2 Audio with Nexus 5

It works better.

Signed-off-by: dr87 <nb00870@gmail.com>

Conflicts:
	arch/arm/configs/d800a_defconfig
	arch/arm/configs/d801a_defconfig
	arch/arm/configs/d802a_defconfig
	arch/arm/configs/d803a_defconfig
	arch/arm/configs/ls980a_defconfig
	arch/arm/configs/vs980a_defconfig
	sound/soc/codecs/es325.c
	sound/soc/msm/qdsp6v2/msm-compr-q6-v2.c
	sound/soc/msm/qdsp6v2/msm-dai-q6-v2.c
	sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c
	sound/soc/msm/qdsp6v2/q6asm.c
	sound/soc/msm/qdsp6v2/q6voice.c
	sound/soc/msm/qdsp6v2/q6voice.h

Conflicts:
	arch/arm/configs/d800_defconfig
	arch/arm/configs/d801_defconfig
	arch/arm/configs/d802_defconfig
	arch/arm/configs/d803_defconfig
	arch/arm/configs/f320x_defconfig
	arch/arm/configs/ls980_defconfig
	arch/arm/configs/vs980_defconfig
	arch/arm/mach-msm/include/mach/qdsp6v2/apr_us_a.h
	arch/arm/mach-msm/include/mach/qdsp6v2/usf.h
	arch/arm/mach-msm/qdsp6v2/audio_acdb.c
	arch/arm/mach-msm/qdsp6v2/rtac.c
	arch/arm/mach-msm/qdsp6v2/ultrasound/usf.c
	arch/arm/mach-msm/qdsp6v2/ultrasound/version_a/q6usm_a.c
	drivers/mfd/wcd9xxx-core.c
	include/sound/q6adm-v2.h
	include/sound/q6asm-v2.h
	sound/soc/codecs/Kconfig
	sound/soc/codecs/Makefile
	sound/soc/codecs/msm8x10-wcd.c
	sound/soc/codecs/msm_hdmi_codec_rx.c
	sound/soc/codecs/wcd9306.c
	sound/soc/codecs/wcd9320.c
	sound/soc/codecs/wcd9xxx-mbhc.c
	sound/soc/codecs/wcd9xxx-mbhc.h
	sound/soc/codecs/wcd9xxx-resmgr.c
	sound/soc/codecs/wcd9xxx-resmgr.h
	sound/soc/msm/Kconfig
	sound/soc/msm/msm8226.c
	sound/soc/msm/msm8974.c
	sound/soc/msm/msm8x10.c
	sound/soc/msm/qdsp6v2/msm-compr-q6-v2.c
	sound/soc/msm/qdsp6v2/msm-compress-q6-v2.c
	sound/soc/msm/qdsp6v2/msm-dai-q6-v2.c
	sound/soc/msm/qdsp6v2/msm-pcm-q6-v2.c
	sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c
	sound/soc/msm/qdsp6v2/q6adm.c
	sound/soc/msm/qdsp6v2/q6asm.c
	sound/soc/msm/qdsp6v2/q6audio-v2.c
	sound/soc/msm/qdsp6v2/q6voice.c
	sound/soc/soc-compress.c
	sound/usb/card.c
Revert "OOM, PM: OOM killed task shouldn't escape PM suspend"

This reverts commit 070c689a5bffd2874549d5b02d96609f01461ae7.
Revert "Replace G2 Audio with Nexus 5"

This reverts commit 5739fd6dd6d0d80d909e82cc864332e140e9d244.