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

Commit 9c9c087a authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android11-5.4.265+ (a34cc1dc) into msm-5.4"

parents ef7ec434 478988c2

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 259

SUBLEVEL = 265

EXTRAVERSION =

NAME = Kleptomaniac Octopus

android/GKI_VERSION

+1 −1
Original line number Diff line number Diff line 
LTS_5.4.259_70db018a109
 
LTS_5.4.265_a34cc1dcf78d

android/abi_gki_aarch64.xml

+102604 −106062

File changed.

File size exceeds preview limit.

View original file
View changed file

arch/arm/boot/dts/am335x-baltos.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ 
&mmc2 {

	status = "okay";

	vmmc-supply = <&wl12xx_vmmc>;

	non-removable;

	ti,non-removable;

	bus-width = <4>;

	cap-power-off-card;

	pinctrl-names = "default";