Merge branch 'android-4.9' into amlogic-4.9-dev

diff --cc Makefile
Simple merge

diff --cc arch/arm64/kernel/head.S
Simple merge

diff --cc arch/arm64/kernel/process.c
Simple merge

diff --cc arch/arm64/kernel/traps.c
Simple merge

diff --cc arch/arm64/mm/fault.c
Simple merge

diff --cc drivers/gpio/gpiolib.c
Simple merge

diff --cc drivers/mtd/nand/nand_base.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Simple merge

diff --cc drivers/staging/android/Kconfig
Simple merge

diff --cc drivers/staging/android/Makefile
index 9529dbe,93c5f5a..af30a2e
--- 1/drivers/staging/android/Makefile
--- 2/drivers/staging/android/Makefile
+++ b/drivers/staging/android/Makefile
@@@ -4,5 -4,5 +4,6 @@@ obj-y                                    += ion
  obj-$(CONFIG_FIQ_DEBUGGER)            += fiq_debugger/
  
  obj-$(CONFIG_ASHMEM)                  += ashmem.o
 +obj-$(CONFIG_ANDROID_LOGGER)            += logger.o
  obj-$(CONFIG_ANDROID_LOW_MEMORY_KILLER)       += lowmemorykiller.o
+ obj-$(CONFIG_ANDROID_VSOC)            += vsoc.o

diff --cc drivers/usb/core/hcd.c
Simple merge

diff --cc drivers/usb/core/quirks.c
Simple merge

diff --cc drivers/usb/host/xhci-plat.c
Simple merge

diff --cc include/linux/fs.h
Simple merge

diff --cc kernel/sched/core.c
Simple merge

diff --cc kernel/sched/fair.c
Simple merge

diff --cc net/ipv4/tcp_input.c
Simple merge