Linux 3.4.81

Conflicts:

	kernel/trace/ftrace.c
	mm/internal.h
	mm/page_alloc.c
Revert "clocks-8960: gpu: add 180 freq and fix caf compatibility for kcontrol"

This reverts commit fb21207f94aaac841082c13a4ff05d33c5567701.
Linux 3.4.81

Conflicts:

	kernel/trace/ftrace.c
	mm/internal.h
	mm/page_alloc.c
Linux 3.4.82
Merge branch 'aosp-normal' of https://github.com/raden/kernel_msm into aosp-normal
Linux 3.4.82
Ampang Defconfig

Signed-off-by: Muhammad Najmi Ahmad Zabidi <najmi.zabidi@gmail.com>
Ampang AOSP v19

Signed-off-by: Muhammad Najmi Ahmad Zabidi <najmi.zabidi@gmail.com>
Ampang AOSP v19 normal

Signed-off-by: Muhammad Najmi Ahmad Zabidi <najmi.zabidi@gmail.com>
crypto: msm: update from CAF kk_3.5_rb2.9

Conflicts:

	drivers/crypto/msm/qce50.c
	drivers/crypto/msm/qcedev.c
	drivers/crypto/msm/qcrypto.c
prima: disable WLAN_FEATURE_HOLD_RX_WAKELOCK

Signed-off-by: Iliyan Malchev <malchev@google.com>

Conflicts:

	drivers/staging/prima/Kbuild
prima: disable WLAN_FEATURE_HOLD_RX_WAKELOCK

Signed-off-by: Iliyan Malchev <malchev@google.com>

Conflicts:

	drivers/staging/prima/Kbuild
Revert "prima: disable WLAN_FEATURE_HOLD_RX_WAKELOCK"

This reverts commit d56cc09c7293c07ad1b3b31a16124723285afc30.
prima: disable WLAN_FEATURE_HOLD_RX_WAKELOCK

Signed-off-by: Iliyan Malchev <malchev@google.com>
Revert "prima: disable WLAN_FEATURE_HOLD_RX_WAKELOCK"

This reverts commit d56cc09c7293c07ad1b3b31a16124723285afc30.
mach-msm: Introduce Dynamic hotplug driver for mako

Introduce a dynamic hotplug driver to automatically online/offline
CPUs proportional to load.

Signed-off-by: Stratos Karafotis <stratosk@semaphore.gr>
prima: disable WLAN_FEATURE_HOLD_RX_WAKELOCK

Signed-off-by: Iliyan Malchev <malchev@google.com>
Revert "prima: disable WLAN_FEATURE_HOLD_RX_WAKELOCK"

This reverts commit d56cc09c7293c07ad1b3b31a16124723285afc30.
mach-msm: dyn_hotplug: Clean up properly on exit

Signed-off-by: Stratos Karafotis <stratosk@semaphore.gr>
mach-msm: dyn_hotplug: Prevent immediate online of a CPU

When a CPU goes offline we should wait at least 1 sec before online it
again.

Signed-off-by: Stratos Karafotis <stratosk@semaphore.gr>