Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 4b4c88cf authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge android11-5.4 into android11-5.4-lts



This merges the android11-5.4 branch into the -lts branch, catching
it up with the latest changes in there.

It contains the following commits:

* 21224f4b Merge tag 'android11-5.4.295_r00' into android11-5.4
* 5287b166 ANDROID: fix kernelci compressed kernel linking
* d72ce6ed ANDROID: GKI: Update symbol list for Zebra
* a4761d14 UPSTREAM: posix-cpu-timers: fix race between handle_posix_cpu_timers() and posix_cpu_timer_del()

Change-Id: Icfb6f14de98e8e0974621c528941d6bed6555e2a
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 76f45415 21224f4b
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment