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

Commit 782e9848 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.19.21 (6e0411bd) into msm-4.19"

parents 75c51925 9d1f5310

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 20

SUBLEVEL = 21

EXTRAVERSION =

NAME = "People's Front"

arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
		bootargs = "console=ttyS4,115200 earlyprintk";

	};



	memory {

	memory@80000000 {

		reg = <0x80000000 0x40000000>;

	};

arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
		bootargs = "earlyprintk";

	};



	memory {

	memory@80000000 {

		reg = <0x80000000 0x20000000>;

	};

arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts

+1 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
		bootargs = "console=ttyS4,115200 earlyprintk";

	};



	memory {

	memory@80000000 {

		reg = <0x80000000 0x40000000>;

	};
@@ -322,4 +322,3 @@ 
&adc {

	status = "okay";

};

arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
		bootargs = "console=ttyS4,115200 earlyprintk";

	};



	memory {

	memory@80000000 {

		reg = <0x80000000 0x20000000>;

	};