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

Skip to content
Commit 1d03502d 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:

e588439d ANDROID: ABI: Update allowed list for Microsoft
8afacb8f ANDROID: GKI: add padding to struct hid_device

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Iadaed57ba470d5f54a85a202ee683ae153b36ce7
parents ae7ff756 e588439d
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