Merge branch 'android-4.9' into amlogic-4.9-dev
authorVictor Wan <victor.wan@amlogic.com>
Tue, 24 Apr 2018 09:43:19 +0000 (17:43 +0800)
committerVictor Wan <victor.wan@amlogic.com>
Tue, 24 Apr 2018 09:43:19 +0000 (17:43 +0800)
commit810c6dd9726a11a3e5fed3497dab5bda208489e9
tree863575bfa29d91c9b7f2d8431e22c9b9b2306334
parent230bfb864b397dfea22afb2ea98362c3e90ce2e9
parentf6bec4e8c771741b44df10fed829093fb61f0d6a
Merge branch 'android-4.9' into amlogic-4.9-dev

Signed-off-by: Victor Wan <victor.wan@amlogic.com>
Conflicts:
arch/arm/configs/bcm2835_defconfig
arch/arm/configs/sunxi_defconfig
include/linux/cpufreq.h
init/main.c
44 files changed:
Makefile
arch/arm64/Makefile
arch/arm64/include/asm/topology.h
arch/arm64/kernel/head.S
arch/arm64/kernel/process.c
arch/arm64/kernel/topology.c
arch/arm64/kernel/traps.c
arch/arm64/mm/mmu.c
drivers/Makefile
drivers/android/binder.c
drivers/cpufreq/Makefile
drivers/gpio/gpiolib.c
drivers/gpu/drm/drm_edid.c
drivers/md/dm-bufio.c
drivers/media/dvb-core/dvb_ca_en50221.c
drivers/mmc/core/core.c
drivers/mtd/nand/nand_base.c
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
drivers/pci/quirks.c
drivers/usb/core/quirks.c
drivers/usb/dwc3/core.c
drivers/usb/dwc3/core.h
drivers/usb/gadget/function/f_fs.c
drivers/usb/host/xhci-mem.c
drivers/video/hdmi.c
include/linux/cpufreq.h
include/linux/fs.h
include/linux/gfp.h
include/linux/mm.h
include/linux/mmzone.h
init/main.c
kernel/module.c
kernel/printk/printk.c
kernel/sched/core.c
kernel/sched/fair.c
kernel/workqueue.c
lib/Kconfig.debug
mm/cma.c
mm/internal.h
mm/page_alloc.c
mm/readahead.c
mm/vmscan.c
mm/vmstat.c
net/ipv4/tcp_input.c