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

Merge branch 'android12-5.4' into android12-5.4-lts



Catch the lts branch up with recent changes done in the non-lts branch.
Changes included in here are:

* 13730620 Merge tag 'android12-5.4.284_r00' into android12-5.4
* e6ac8bee UPSTREAM: unicode: Don't special case ignorable code points
* 0078e98e ANDROID: 16K: Fixup padding vm_flags bits on VMA splits
* a7e8b139 ANDROID: 16K: Introduce pgsize_migration_inline.h

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