review.tizen.org Git - platform/kernel/linux-amlogic.git/commit

projects / platform / kernel / linux-amlogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3e76ff2 b16a533)

author	Nick Xie <nick@khadas.com>
	Thu, 25 Jul 2019 09:03:43 +0000 (17:03 +0800)
committer	Nick Xie <nick@khadas.com>
	Thu, 25 Jul 2019 09:03:43 +0000 (17:03 +0800)
commit	cdb529c38c6d260fe002cff44fef03f9c6c09239
tree	d412a6d46065755c376d8c9bf6b632219a06ce31	tree \| snapshot
parent	3e76ff20715a384a25175b81e4df1a9e59e819b7	commit \| diff
parent	b16a5334ed1211bf961c5883eb0f3ce35e90b4df	commit \| diff

Merge tag 'v4.9.180' into khadas-vims-4.9.y-update

This is the 4.9.180 stable release

Conflicts:
arch/arm64/mm/proc.S

19 files changed:

Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/pgtable.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/asm-offsets.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/vdso.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/vdso/gettimeofday.S	diff1 \|	diff2 \|	blob \| history
arch/arm64/mm/proc.S	diff1 \|	diff2 \|	blob \| history
arch/x86/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/fault.c	diff1 \|	diff2 \|	blob \| history
drivers/base/power/main.c	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/cpufreq.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_fops.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/core/sd.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/ufs/ufshcd.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/core/hcd.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/core/hub.c	diff1 \|	diff2 \|	blob \| history
fs/char_dev.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/inode.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/core.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel;