]> www.infradead.org Git - users/willy/pagecache.git/commitdiff
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 31 Jul 2023 01:53:55 +0000 (11:53 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 31 Jul 2023 01:53:55 +0000 (11:53 +1000)
1  2 
arch/Kconfig
kernel/events/core.c

diff --cc arch/Kconfig
Simple merge
Simple merge