Merge "Merge "Merge "cfg80211: discard regulatory hints from country IEs with undefined wiphy"""
Merge "msm: msm_fb: Update panel info in case of resolution change. In case of resolution change, panel_info and mfd are updated with latest resolution."
Merge "Merge "msm: msm_fb: Update panel info in case of resolution change. In case of resolution change, panel_info and mfd are updated with latest resolution.""
msm: kgsl: Fix mem leak when page allocation fails

Page allocation may fail during OOM condition. Update
sglen and size to correct value (allocated) so that
they get freed in kgsl_sharedmem_free().

Change-Id: I1aa0ca77bb767523dfcf0f6cc3a21eac2b6b80e4
Signed-off-by: Hareesh Gundu <hareeshg@codeaurora.org>
cfg80211: permanently disable channels specified by base settings

if a custom regulatory domain is passed and if a rule for a channel
indicates it should be disabled that channel should always remain
disabled as per its documentation and design.
Likewise if WIPHY_FLAG_STRICT_REGULATORY flag is set and a
regulatory_hint() is issued if a channel is disabled that channel should
remain disabled.
Without this change only drivers that set the _orig flags appropriately
on their own would ensure disallowed channels remaind disabled. This
helps drivers save code by relying on the APIS provided to entrust
channels that should not be enabled be respected by only having to use
wiphy_apply_custom_regulatory() or regulatory_hint() with the
WIPHY_FLAG_STRICT_REGULATORY set.
If wiphy_apply_custom_regulatory() is used together with
WIPHY_FLAG_STRICT_REGULATORY and a regulatory_hint() issued later, the
incoming regulatory domain can override previously set _orig parameters
from the initial custom regulatory setting.

Change-Id: Ia1af4b293bd299ac20e1934e5e03e633ecb9d6ee
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Signed-off-by: Mihir Shete <smihir@codeaurora.org>
Merge "Merge "Merge "msm: msm_fb: Update panel info in case of resolution change. In case of resolution change, panel_info and mfd are updated with latest resolution."""
Merge "Merge "msm: msm_fb: Update panel info in case of resolution change. In case of resolution change, panel_info and mfd are updated with latest resolution.""
uio: msm_shared: Add support for platform data

Update the driver to support backward compatibility for devices
relying on board files for platform data.

CRs-Fixed: 592586
Change-Id: I04d4195a7fd4b926e52b0cbb2bb33cfcc054689f
Signed-off-by: Pratibhasagar V <pratibha@codeaurora.org>
ARM: dts: msm: Add support for UIO devices for RemoteFS

The RemoteFS server now uses the UIO driver. So add the UIO
device for msm8960 and msm8930.

CRs-Fixed: 592586
Change-Id: I94eb28ae9a047b09de79eb69c512cb312fabe47f
Signed-off-by: Pratibhasagar V <pratibha@codeaurora.org>
Merge "Merge "Merge "msm: msm_fb: Update panel info in case of resolution change. In case of resolution change, panel_info and mfd are updated with latest resolution."""
Merge AU_LINUX_ANDROID_KK_2.7_RB1.04.04.01.007.025 on remote branch

Change-Id: I603257639c5c228eb6f25253ca1f48dd090490fb
Merge "Merge AU_LINUX_ANDROID_KK_2.7_RB1.04.04.01.007.025 on remote branch"
Merge "Merge "msm: msm_fb: Update panel info in case of resolution change. In case of resolution change, panel_info and mfd are updated with latest resolution.""
Merge "Merge "Merge "msm: msm_fb: Update panel info in case of resolution change. In case of resolution change, panel_info and mfd are updated with latest resolution."""
Merge "Merge "msm: msm_fb: Update panel info in case of resolution change. In case of resolution change, panel_info and mfd are updated with latest resolution.""
Merge "cfg80211: fix set_regdom() to cancel requests with same alpha2"
Merge "msm: wlan: Add VHT80 support on db.txt"
Merge "msm: wlan: update  db.txt with information from compliance team"
Merge "cfg80211: export regulatory_hint_user() API"
Merge "Merge "Merge "msm: msm_fb: Update panel info in case of resolution change. In case of resolution change, panel_info and mfd are updated with latest resolution."""