Commit f511b291 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge android12-5.4 into android12-5.4-lts



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

It contains the following commits:

* dfb47b62 Merge tag 'android12-5.4.295_r00' into android12-5.4
* 0e19b105 ANDROID: fix kernelci compressed kernel linking
* 3041dc18 UPSTREAM: posix-cpu-timers: fix race between handle_posix_cpu_timers() and posix_cpu_timer_del()

Change-Id: I93da8f7f9f455d74fe7b5deda2748971fca2bf5c
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 3c6a810d dfb47b62
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment