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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 4393c9b 8baec4e)

author	Nick <nick@khadas.com>
	Tue, 21 May 2019 10:02:08 +0000 (18:02 +0800)
committer	Nick <nick@khadas.com>
	Tue, 21 May 2019 10:02:08 +0000 (18:02 +0800)
commit	33173565bd7298c09be7ccfe778ea3a8df554ac3
tree	e1ab8364d67f6efd8226b5670160c107e5d6c0c5	tree \| snapshot
parent	4393c9b2461526fb9352ebbedcb6ecc9fdbd6428	commit \| diff
parent	8baec4ebdf084961516f17cadbad14cac082ee4e	commit \| diff

Merge tag 'v4.9.177' into khadas-vim3-4.9.y

This is the 4.9.177 stable release

Conflicts:
arch/x86/entry/vdso/Makefile
kernel/bpf/hashtab.c
net/core/fib_rules.c

Makefile	diff1 \|	diff2 \|	blob \| history
include/linux/efi.h	diff1 \|	diff2 \|	blob \| history
init/main.c	diff1 \|	diff2 \|	blob \| history
kernel/bpf/hashtab.c	diff1 \|	diff2 \|	blob \| history
net/core/fib_rules.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/raw.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel;