net: wireless: bcmdhd: Go back to CAF version

Signed-off-by: Rashed Abdel-Tawab <rashed@linux.com>
bcmdhd: Add LG's reserved memory options

Signed-off-by: Rashed Abdel-Tawab <rashed@linux.com>
g2: Adjust to the new bcmdhd driver

* Add the 4335 configuration options
* Flesh out the mac address reader
* Enable the static buf options

Signed-off-by: Rashed Abdel-Tawab <rashed@linux.com>

Conflicts:
	arch/arm/mach-msm/lge/wifi_bcm_lge.c
	drivers/net/wireless/bcmdhd/Kconfig
	drivers/net/wireless/bcmdhd/Makefile
vidc: Cleanups

Signed-off-by: Rashed Abdel-Tawab <rashed@linux.com>

Conflicts:
	drivers/media/platform/msm/vidc/msm_venc.c
	drivers/media/platform/msm/vidc/vidc_hfi_api.h
	drivers/media/platform/msm/vidc/vidc_hfi_helper.h
BU52031NVX: Add lid events to support the smartcover

Signed-off-by: Rashed Abdel-Tawab <rashed@linux.com>

Conflicts:
	drivers/misc/pm8xxx-cradle.c
msm: qpnp-power-on: Remove the wakelocks

Change-Id: I1a11903c9bda682ffce18ba4c852a71554bb26fe
Signed-off-by: Rashed Abdel-Tawab <rashed@linux.com>

Conflicts:
	drivers/platform/msm/qpnp-power-on.c
cpufreq: Remove original grid-stepping implementation

A new one exists based on cpu-boost instead of the ondemand governor

Change-Id: I0474892b3b37cdc4e717776e4238a7201e38c557
Signed-off-by: Rashed Abdel-Tawab <rashed@linux.com>

Conflicts:
	drivers/cpufreq/cpufreq_ondemand.c
cpufreq: Add LG's new grid-stepping implementation

Change-Id: I68b09df130c2b38b871650bd70ee60477c73edce
Signed-off-by: Rashed Abdel-Tawab <rashed@linux.com>

Conflicts:
	drivers/cpufreq/cpu-boost.c
galbi: smem: split out shared memory initialization functionality

Apply change I675db52961df80d6e8e62e771630e562bf1a670c to all
g2/z devices

Change-Id: Ia7594499cc94b843f36038e093cad4d86539192b
Signed-off-by: Rashed Abdel-Tawab <rashed@linux.com>

Conflicts:
	arch/arm/mach-msm/lge/board-8974-g2-au.c
	arch/arm/mach-msm/lge/board-8974-g2-com.c
	arch/arm/mach-msm/lge/board-8974-g2-dcm.c
	arch/arm/mach-msm/lge/board-8974-g2-kr.c
	arch/arm/mach-msm/lge/board-8974-g2-us.c
	arch/arm/mach-msm/lge/board-8974-vu3-kr.c
	arch/arm/mach-msm/lge/board-8974-z-kr.c
galbi: Modify functional mode of suspened GPIO

Apply change Ida766a16fb1e25ebedb7dcbf17dfc81f5dbb6f0b to all
g2/z devices

Change-Id: I3da3e03cd04e075dc665414c81915f953b1aeb65
Signed-off-by: Rashed Abdel-Tawab <rashed@linux.com>
mmc: Get rid of CONFIG_MACH_MSM8974_EMMC_HW_RESET

Change-Id: Ibeb4d8c4c0e8188a48d468907dc42adce40be136
Signed-off-by: Rashed Abdel-Tawab <rashed@linux.com>
leds: At disable, set the trigger to default instead of wiping it

Change-Id: Ifb4a3b3034c441d29fd1d9f209ed829adfc76a72
Signed-off-by: Rashed Abdel-Tawab <rashed@linux.com>
msm_sdcc: Fix building without BROADCOM_WIFI_RESERVED_MEM

There's no DMA QoS support when a static buffer isn't in use

Change-Id: If34a11c1f4362d08e3198558f7e0830f47447b5d
Signed-off-by: Rashed Abdel-Tawab <rashed@linux.com>

Conflicts:
	drivers/mmc/host/msm_sdcc.c
galbi: Declare ION carveouts in DT files

Required after I0a2b48299c829a828764d74a1d8e3c8f97de706d

Change-Id: I7122029aa3842fc90b88b48cb568599fe125f5b8
Signed-off-by: Rashed Abdel-Tawab <rashed@linux.com>

Conflicts:
	arch/arm/boot/dts/msm8974-g2-opt_au/msm8974-g2-opt_au.dtsi
	arch/arm/boot/dts/msm8974-g2-spr/msm8974-g2-spr.dtsi
	arch/arm/boot/dts/msm8974-g2-vzw/msm8974-g2-vzw.dtsi
	arch/arm/boot/dts/msm8974-z-att/msm8974-z-att.dtsi
	arch/arm/boot/dts/msm8974-z-spr/msm8974-z-spr.dtsi
	arch/arm/boot/dts/msm8974-z-tmo/msm8974-z-tmo.dtsi
fs: Remove LGE's kfips, ext4 recovery, and readahead profiling

Change-Id: Ib015487d059adfb0dbf12308ba03b575dde5e898
Signed-off-by: Rashed Abdel-Tawab <rashed@linux.com>

Conflicts:
	fs/exec.c
	fs/ext4/super.c
	fs/open.c
	fs/sreadahead_prof.c
	fs/sreadahead_prof.h
	mm/filemap.c
hrtimer: Restore original lock path

Change-Id: Icbca20123b7685038bd2533f790fe9576ec4c1b2
Signed-off-by: Rashed Abdel-Tawab <rashed@linux.com>
msm: sdcc: Use wifi_control_func to identify the wlan slot

Change-Id: I2a694d17ee74d90d789892e5058190b6cf8f4934
Signed-off-by: Rashed Abdel-Tawab <rashed@linux.com>

Conflicts:
	drivers/mmc/host/msm_sdcc.c
Revert "rfkill: Don't run btlock"

This reverts commit bb18f50ac969f476652de294c356600d933abc70.
bluesleep: Don't wait for uart tx queue to flush before entering standby

There's no need to delay sleep for this. msm_hs_serial will do it on
its own, and this reduces the time to enter lpm

Change-Id: Ia13d44148130aaf133ea888807b5ba114936ce78
Signed-off-by: Rashed Abdel-Tawab <rashed@linux.com>
cfg80211: mlme: Silently ignore duplicate management registrations

Instead of erroring out, just ignore the call

Change-Id: I5ff67100ea2d7f53bd30b6844c462bca71c24d15
Signed-off-by: Rashed Abdel-Tawab <rashed@linux.com>