git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: ceb9e77 be2eca9)

author	Arnaldo Carvalho de Melo <acme@redhat.com>
	Tue, 26 Nov 2019 14:06:19 +0000 (11:06 -0300)
committer	Arnaldo Carvalho de Melo <acme@redhat.com>
	Tue, 26 Nov 2019 14:06:19 +0000 (11:06 -0300)
commit	2ea352d5960ad469f5712cf3e293db97beac4e01
tree	c24ae19073f2884867b310ee193d36a82075b60f	tree \| snapshot
parent	ceb9e77324fa661b1001a0ae66f061b5fcb4e4e6	commit \| diff
parent	be2eca94d144e3ffed565c483a58ecc76a869c98	commit \| diff

Merge remote-tracking branch 'torvalds/master' into perf/core

To pick up BPF changes we'll need.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/x86/events/intel/core.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/x86.c	diff1 \|	diff2 \|	blob \| history
include/linux/perf_event.h	diff1 \|	diff2 \|	blob \| history
kernel/events/core.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree