git.stricted.de - GitHub/LineageOS/G12/android_kernel_amlogic

projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit

author	Victor Wan <victor.wan@amlogic.com>
	Tue, 7 Aug 2018 06:43:24 +0000 (14:43 +0800)
committer	Victor Wan <victor.wan@amlogic.com>
	Tue, 7 Aug 2018 06:43:24 +0000 (14:43 +0800)
commit	cc7b1eac546a25e7d4f2e057ef9b817af6597598
tree	9101245d7347145c412970db6135ca6653da9bb0	tree \| snapshot (tar.gz zip)
parent	32b05b3c6ab2b1700af6ec2ed5bc146709a92734	commit \| diff
parent	47bbcd6bf8f926e4e009c12b18f349ffa41bafd4	commit \| diff

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

Signed-off-by: Victor Wan <victor.wan@amlogic.com>
Conflicts:
drivers/md/dm-bufio.c
drivers/media/dvb-core/dvb_frontend.c
drivers/usb/dwc3/core.c
drivers/usb/gadget/function/f_fs.c

33 files changed:

Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/cpufeature.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/process.c	diff1 \|	diff2 \|	blob \| history
drivers/android/binder.c	diff1 \|	diff2 \|	blob \| history
drivers/block/loop.c	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/cpufreq.c	diff1 \|	diff2 \|	blob \| history
drivers/dma-buf/sync_file.c	diff1 \|	diff2 \|	blob \| history
drivers/gpio/gpiolib.c	diff1 \|	diff2 \|	blob \| history
drivers/md/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/md/dm-verity-target.c	diff1 \|	diff2 \|	blob \| history
drivers/media/dvb-core/dmxdev.c	diff1 \|	diff2 \|	blob \| history
drivers/media/dvb-core/dvb_frontend.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/pci/quirks.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/android/ion/ion_heap.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/core/quirks.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/dwc3/core.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/dwc3/core.h	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/function/f_fs.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/xhci-mem.c	diff1 \|	diff2 \|	blob \| history
include/linux/mm.h	diff1 \|	diff2 \|	blob \| history
kernel/sched/core.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/cpufreq_schedutil.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/fair.c	diff1 \|	diff2 \|	blob \| history
kernel/sysctl.c	diff1 \|	diff2 \|	blob \| history
kernel/workqueue.c	diff1 \|	diff2 \|	blob \| history
mm/page_alloc.c	diff1 \|	diff2 \|	blob \| history
mm/vmscan.c	diff1 \|	diff2 \|	blob \| history
net/dccp/ipv4.c	diff1 \|	diff2 \|	blob \| history
net/dccp/ipv6.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_state.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_user.c	diff1 \|	diff2 \|	blob \| history

RSS Atom

Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/cpufeature.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/process.c	diff1 \|	diff2 \|	blob \| history
drivers/android/binder.c	diff1 \|	diff2 \|	blob \| history
drivers/block/loop.c	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/cpufreq.c	diff1 \|	diff2 \|	blob \| history
drivers/dma-buf/sync_file.c	diff1 \|	diff2 \|	blob \| history
drivers/gpio/gpiolib.c	diff1 \|	diff2 \|	blob \| history
drivers/md/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/md/dm-verity-target.c	diff1 \|	diff2 \|	blob \| history
drivers/media/dvb-core/dmxdev.c	diff1 \|	diff2 \|	blob \| history
drivers/media/dvb-core/dvb_frontend.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/pci/quirks.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/android/ion/ion_heap.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/core/quirks.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/dwc3/core.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/dwc3/core.h	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/function/f_fs.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/xhci-mem.c	diff1 \|	diff2 \|	blob \| history
include/linux/mm.h	diff1 \|	diff2 \|	blob \| history
kernel/sched/core.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/cpufreq_schedutil.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/fair.c	diff1 \|	diff2 \|	blob \| history
kernel/sysctl.c	diff1 \|	diff2 \|	blob \| history
kernel/workqueue.c	diff1 \|	diff2 \|	blob \| history
mm/page_alloc.c	diff1 \|	diff2 \|	blob \| history
mm/vmscan.c	diff1 \|	diff2 \|	blob \| history
net/dccp/ipv4.c	diff1 \|	diff2 \|	blob \| history
net/dccp/ipv6.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_state.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_user.c	diff1 \|	diff2 \|	blob \| history