Commit 6c3bea63 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:

* 71d05153 Merge tag 'android12-5.4.293_r00' into android12-5.4
* e0a30b8f ANDROID: binder: fix minimum node priority comparison
* 2dc739e6 ANDROID: 16K: Remove ELF padding entry from map_file ranges

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