Merge android-4.4 into dev-kernel

Brings in latest patches from android-4.4
upstream into our downstream repo

Bug 200204057

Change-Id: I64d9b57e1377da94fb255922db75fdb83f20005f
Signed-off-by: Ishan Mittal <imittal@nvidia.com>

diff --cc arch/arm64/Makefile
index 9dd648865311c1fd872086fe850b1b590c9f2489,4e77fd165f38ec3a7215bac31ee5539a0ac88a6a..181e51e639d107592bce7a724ddc79b5a18375a8
--- 1/arch/arm64/Makefile
--- 2/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
@@@ -100,10 -98,15 +100,10 @@@ zinstall install: vmlinu
  %.dtb: scripts
        $(Q)$(MAKE) $(build)=$(boot)/dts $(boot)/dts/$@
  
 -PHONY += dtbs dtbs_install
 -
 -dtbs: prepare scripts
 -      $(Q)$(MAKE) $(build)=$(boot)/dts
 -
 -dtbs_install:
 -      $(Q)$(MAKE) $(dtbinst)=$(boot)/dts
 +dtbs: scripts
 +      $(Q)$(MAKE) $(build)=$(boot)/dts dtbs
  
- Image.gz-dtb: vmlinux scripts dtbs
+ Image-dtb Image.gz-dtb: vmlinux scripts dtbs
        $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
  
  PHONY += vdso_install

diff --cc arch/arm64/boot/Makefile
Simple merge

diff --cc drivers/cpufreq/cpufreq_interactive.c
Simple merge

diff --cc drivers/misc/Kconfig
index 2a56d00bb3b8306f7de168d5a6ae59d170de3c50,2763d6b3b0630f250d80e58fbd099beb36f1382b..c62d6e9cbf477b8e583afb4ebc70b93cfa3f6185
--- 1/drivers/misc/Kconfig
--- 2/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@@ -420,16 -412,6 +420,12 @@@ config TI_DAC751
          This driver can also be built as a module. If so, the module
          will be called ti_dac7512.
  
- config UID_STAT
-       bool "UID based statistics tracking exported to /proc/uid_stat"
-       default n
- 
 +config TEGRA_CRYPTO_DEV
 +        bool "Device node to access tegra aes hardware"
 +        ---help---
 +        Dev node /dev/tegra-crypto in order to get access to tegra aes
 +        hardware from user space
 +
  config VMWARE_BALLOON
        tristate "VMware Balloon Driver"
        depends on VMWARE_VMCI && X86 && HYPERVISOR_GUEST

diff --cc drivers/misc/Makefile
Simple merge

diff --cc include/trace/events/power.h
Simple merge

diff --cc mm/mmap.c
Simple merge

diff --cc mm/vmscan.c
Simple merge