]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ac6b4c5 38babc4)
Merge remote-tracking branch 'rcu/rcu/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 2 Sep 2021 01:53:40 +0000 (11:53 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 2 Sep 2021 01:53:40 +0000 (11:53 +1000)
# Conflicts:
# kernel/time/tick-internal.h

1  2 
kernel/time/clocksource.c patch | diff1 | diff2 | blob | history

diff --cc kernel/time/clocksource.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.