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

Merge branch 'android11-5.4' into 'android11-5.4-lts' 



Sync up with android11-5.4 for the following commits:

82038e31 ANDROID: FUSE OWNERS pointing to android-mainline OWNERS
1c758464 ANDROID: abi_gki_aarch64_db845c: Regenerate symbols list after enabling QCOM_TSENSE
c07e36bf ANDROID: db845c_gki.fragment: Add QCOM_TSENSE config to avoid thermal crashes

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: If413865f2eb0ac4672da9cdbb6ab34778717f6e5
parents 24769800 82038e31
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment