Merge branch 'amlogic-4.9-dev' into bringup/amlogic-4.9/sync20190611_forQ_merge_trunk...
authorJianxin Pan <jianxin.pan@amlogic.com>
Mon, 16 Sep 2019 07:01:01 +0000 (03:01 -0400)
committerJianxin Pan <jianxin.pan@amlogic.com>
Mon, 16 Sep 2019 07:01:01 +0000 (03:01 -0400)
commit0f03d8f5fe11fae3e96bcd0845d6dbe319021dc6
tree73122a984cbbcc67488a55918f4a3e842283f935
parente60e41eefe5b4a9cd072f57d15450d8c450638a1
parentd902780cabd5e173af7fd80098a555ed4ddcf467
Merge branch 'amlogic-4.9-dev' into bringup/amlogic-4.9/sync20190611_forQ_merge_trunk_20190916

PD#SWPL-14054

Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
58 files changed:
MAINTAINERS
arch/arm/Makefile
arch/arm/boot/dts/amlogic/g12a_s905d2_u200.dts
arch/arm/boot/dts/amlogic/g12a_s905d2_u200_1g.dts
arch/arm/boot/dts/amlogic/g12a_s905x2_u212.dts
arch/arm/boot/dts/amlogic/g12a_s905x2_u212_1g.dts
arch/arm/boot/dts/amlogic/g12b_a311d_w400.dts
arch/arm/boot/dts/amlogic/gxl_p212_1g.dts
arch/arm/boot/dts/amlogic/mesonsm1.dtsi
arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts
arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts
arch/arm/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts
arch/arm/boot/dts/amlogic/sm1_s905x3_ac213.dts
arch/arm/configs/meson64_a32_defconfig
arch/arm/include/asm/system_misc.h
arch/arm/kernel/Makefile
arch/arm64/Makefile
arch/arm64/boot/dts/amlogic/g12a_s905d2_u200.dts
arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_1g.dts
arch/arm64/boot/dts/amlogic/g12a_s905x2_u212.dts
arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_1g.dts
arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts
arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts
arch/arm64/boot/dts/amlogic/mesonsm1.dtsi
arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts
arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts
arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts
arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213.dts
arch/arm64/configs/meson64_defconfig
arch/arm64/include/asm/system_misc.h
arch/arm64/kernel/perf_event.c
drivers/amlogic/cpu_hotplug/cpu_hotplug.c
drivers/amlogic/media/enhancement/amdolby_vision/amdolby_vision.c
drivers/amlogic/media/enhancement/amvecm/hdr/am_hdr10_plus_ootf.c
drivers/gpu/drm/drm_atomic.c
drivers/gpu/drm/drm_ioctl.c
drivers/mtd/spi-nor/spi-nor.c
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
drivers/usb/host/xhci-ring.c
drivers/usb/host/xhci.c
drivers/usb/host/xhci.h
include/linux/page-flags.h
include/net/tcp.h
include/trace/events/mmflags.h
mm/cma.c
mm/compaction.c
mm/kasan/kasan.c
mm/memory.c
mm/migrate.c
mm/page_alloc.c
mm/shmem.c
mm/slub.c
mm/swap_state.c
mm/vmalloc.c
mm/vmscan.c
net/ipv4/sysctl_net_ipv4.c
net/ipv4/tcp.c
net/ipv4/tcp_input.c