Merge with ML2 kernel source

Change-Id: I46a24e5828b1a612af9e8116a7b800d60d4f202b
Signed-off-by: Willi Ye <williye97@gmail.com>

Conflicts:
	arch/arm/configs/msm8930_baffinvetd_defconfig
	arch/arm/configs/msm8930_biscotto_defconfig
	arch/arm/configs/msm8930_biscotto_eng_defconfig
	arch/arm/configs/msm8930_cane_defconfig
	arch/arm/configs/msm8930_crater_00_defconfig
	arch/arm/configs/msm8930_cratertd_defconfig
	arch/arm/configs/msm8930_express2_defconfig
	arch/arm/configs/msm8930_express_defconfig
	arch/arm/configs/msm8930_golden_att_defconfig
	arch/arm/configs/msm8930_golden_defconfig
	arch/arm/configs/msm8930_golden_eng_defconfig
	arch/arm/configs/msm8930_golden_vzw_defconfig
	arch/arm/configs/msm8930_higgs_defconfig
	arch/arm/configs/msm8930_higgs_eng_defconfig
	arch/arm/configs/msm8930_jasper2_defconfig
	arch/arm/configs/msm8930_jasper2_eng_defconfig
	arch/arm/configs/msm8930_jasper2_vzw_defconfig
	arch/arm/configs/msm8930_jasper2_vzw_rev02_defconfig
	arch/arm/configs/msm8930_ks02_defconfig
	arch/arm/configs/msm8930_ks02_skt_defconfig
	arch/arm/configs/msm8930_lt02-chn_defconfig
	arch/arm/configs/msm8930_lt02_att_defconfig
	arch/arm/configs/msm8930_lt02_chnctc_defconfig
	arch/arm/configs/msm8930_lt02_defconfig
	arch/arm/configs/msm8930_lt02_eng_defconfig
	arch/arm/configs/msm8930_lt02_spr_defconfig
	arch/arm/configs/msm8930_melius_00_defconfig
	arch/arm/configs/msm8930_melius_01_defconfig
	arch/arm/configs/msm8930_melius_att_defconfig
	arch/arm/configs/msm8930_melius_chncmcc_3g_defconfig
	arch/arm/configs/msm8930_melius_chnctc_3g_defconfig
	arch/arm/configs/msm8930_melius_chnopen_3g_defconfig
	arch/arm/configs/msm8930_melius_eng_defconfig
	arch/arm/configs/msm8930_melius_ktt_defconfig
	arch/arm/configs/msm8930_melius_lgt_defconfig
	arch/arm/configs/msm8930_melius_skt_defconfig
	arch/arm/configs/msm8930_melius_spr_defconfig
	arch/arm/configs/msm8930_melius_tmo_defconfig
	arch/arm/configs/msm8930_melius_usc_defconfig
	arch/arm/configs/msm8930_melius_vzw_defconfig
	arch/arm/configs/msm8930_melius_zh_lte_defconfig
	arch/arm/configs/msm8930_serrano_att_defconfig
	arch/arm/configs/msm8930_serrano_defconfig
	arch/arm/configs/msm8930_serrano_eng_defconfig
	arch/arm/configs/msm8930_serrano_spr_defconfig
	arch/arm/configs/msm8930_serrano_tmo_defconfig
	arch/arm/configs/msm8930_serrano_usa_defconfig
	arch/arm/configs/msm8930_serrano_usc_defconfig
	arch/arm/configs/msm8930_serrano_vzw_defconfig
	arch/arm/configs/msm8960-perf_defconfig
	arch/arm/configs/msm8960_defconfig
	build-all.py
lowmemorykiller: Use upstream version instead of Samsung's

Change-Id: I3c3870125a311ad4e7ccfcb1293a56bc00a196e3
Signed-off-by: Willi Ye <williye97@gmail.com>

Conflicts:
	arch/arm/configs/cyanogen_serrano_defconfig
	arch/arm/configs/msm8930_golden_att_defconfig
	arch/arm/configs/msm8930_golden_bmc_defconfig
	arch/arm/configs/msm8930_golden_vzw_defconfig
	arch/arm/configs/msm8930_loganre_defconfig
	arch/arm/configs/msm8930_melius_ktt_defconfig
	arch/arm/configs/msm8930_melius_lgt_defconfig
	arch/arm/configs/msm8930_melius_skt_defconfig
exFAT: Update to v1.2.5

Change-Id: I6a43a674e5edc599b00a902247539b11569f4e6f
ARM: 7626/1: arm/crypto: Make asm SHA-1 and AES code Thumb-2 compatible

This patch fixes aes-armv4.S and sha1-armv4-large.S to work
natively in Thumb.  This allows ARM/Thumb interworking workarounds
to be removed.

I also take the opportunity to convert some explicit assembler
directives for exported functions to the standard
ENTRY()/ENDPROC().

For the code itself:

  * In sha1_block_data_order, use of TEQ with sp is deprecated in
    ARMv7 and not supported in Thumb.  For the branches back to
    .L_00_15 and .L_40_59, the TEQ is converted to a CMP, under the
    assumption that clobbering the C flag here will not cause
    incorrect behaviour.

    For the first branch back to .L_20_39_or_60_79 the C flag is
    important, so sp is moved temporarily into another register so
    that TEQ can be used for the comparison.

  * In the AES code, most forms of register-indexed addressing with
    shifts and rotates are not permitted for loads and stores in
    Thumb, so the address calculation is done using a separate
    instruction for the Thumb case.

The resulting code is unlikely to be optimally scheduled, but it
should not have a large impact given the overall size of the code.
I haven't run any benchmarks.

Signed-off-by: Dave Martin <dave.martin@linaro.org>
Tested-by: David McCullough <ucdevel@gmail.com> (ARM only)
Acked-by: David McCullough <ucdevel@gmail.com>
Acked-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Change-Id: I819f921198fd6cabfe0ae422607a5392d49040f4
ARM: 7723/1: crypto: sha1-armv4-large.S: fix SP handling

Make the SHA1 asm code ABI conformant by making sure all stack
accesses occur above the stack pointer.

Origin:
http://git.openssl.org/gitweb/?p=openssl.git;a=commit;h=1a9d60d2

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Acked-by: Nicolas Pitre <nico@linaro.org>
Cc: stable@vger.kernel.org
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Change-Id: Ia7fbf87db0cba99cb22cb432748a0e7f84192177
display: samsung: Fixup after ML2 merge

 * These were overwritten in the merge

Change-Id: Ic68a24e3929de3f3d9200006476a2f256ce3eda7
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>
cfg80211: fix set_regdom() to cancel requests with same alpha2

Use a different error code if the regdomain is same and then
set the request processed so that it doesn't block new
requests.

Git-commit: 959085352b7c44ff9bae4d8a4d76146193260e4c
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
Author: Kalle Valo <kvalo@qca.qualcomm.com>
Date: Thu Jul 12 15:33:58 2012 +0300

Change-Id: I8cbcf80bb43d983c72cf9037f30e11ae8d329b06
Signed-off-by: Mihir Shete <smihir@codeaurora.org>
msm: wlan: Add VHT80 support on db.txt

Adding support for VHT80 on db.txt

Git-commit: 342e794bf4130b624939504e97169c6d41bec011
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-regdb.git
Author: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Date: 2013-07-17 02:18:42 (GMT)

CRs-Fixed: 557666
Change-Id: I91ed6f4d52a7b7bea93047f14455cc11b9f203ea
Acked-by: Tushnim Bhattacharyya <tushnimb@codeaurora.org>
Signed-off-by: Mihir Shete <smihir@codeaurora.org>
msm: wlan: update  db.txt with information from compliance team

Update the db.txt with new information from regulatory compliance
team.

Change-Id: I22d123c28becb87228f96116456fd2b969440fd3
Signed-off-by: Arif Hussain <arifhussain@codeaurora.org>
CRs-Fixed: 571151
cfg80211: export regulatory_hint_user() API

This is to help the hardware configured in world
roaming mode to save power when not connected to
any AP.

CRs-Fixed: 542802
Change-Id: Ia643d0e9848dcd486832973bd6dd186edd7bd4ea
Signed-off-by: Mihir Shete <smihir@codeaurora.org>
wlan: Prima 3.2.7.24

Change-Id: Ia50112dff42bd44f037955fb674fc740da928514
msm: bam_dmux: tune downlink polling parameters

This change disables the BAM DMUX adaptive timer - this is to address
concerns about drops in TCP throughput for some use cases with the timer
enabled.  It also sets the aggregation to 3ms to save power while not
compromising performance. Power tests show a savings of 3-4% (compared to
having the timer poll the BAM pipe every 1 ms) for LTE (40Mbps downlink and
25Mbps uplink) and HSPA (7Mbps downlink and 384Kbps uplink) with no
degradation in performance.

Change-Id: Ia51eae773723e60d8b051766ad80bfb0a16f5f6d
Signed-off-by: Anurag Singh <anursing@codeaurora.org>
Revert lowmem and vmalloc patches

Revert "mm: make is_vmalloc_addr lockless"

This reverts commit 675539b2812b0db12490210ed079185f933a1b3b.

Revert "Kconfig: Add menu choice option to reclaim virtual memory"

This reverts commit a447197635ef394d8e9270bbcc7049f8beb20e75.

Revert "Kconfig: Add config option to support vmalloc savings"

This reverts commit f5130adb4c3abd7cbe977f7304bf6fb3ced84fc7.

Revert "mm: Update is_vmalloc_addr to account for vmalloc savings"

This reverts commit 62da64efd769329b19ca1602d5bb5c4ff564a682.

Revert "msm: Increase the kernel virtual area to include lowmem"

This reverts commit 274df3aaf5836c671823318d20ccfac962b4e411.

Revert "msm: Allow lowmem to be non contiguous and mixed."

This reverts commit 258fe02b4797883aef9823a8d1c336ada71a7516.
Revert "msm: ehci-hsic: Add support to disable internal clock gating"

This reverts commit dacca7ab3801b94a04b79e6259be48977314ded2.
msm: Kconfig: Fix dependency warning

Change-Id: I05a77df367e25eb76a998e4b79cf9d5aafe0feb2