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

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

Merge "Merge android-4.19-q.95 (138a4a65) into msm-4.19"

parents c5cdd54f 94599643

Documentation/admin-guide/kernel-parameters.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -113,7 +113,7 @@ 
			the GPE dispatcher.

			the GPE dispatcher.

			This facility can be used to prevent such uncontrolled

			This facility can be used to prevent such uncontrolled

			GPE floodings.

			GPE floodings.

			Format: <int>

			Format: <byte>





	acpi_no_auto_serialize	[HW,ACPI]

	acpi_no_auto_serialize	[HW,ACPI]

			Disable auto-serialization of AML methods

			Disable auto-serialization of AML methods

Makefile

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

# SPDX-License-Identifier: GPL-2.0

VERSION = 4

VERSION = 4

PATCHLEVEL = 19

PATCHLEVEL = 19

SUBLEVEL = 91

SUBLEVEL = 95

EXTRAVERSION =

EXTRAVERSION =

NAME = "People's Front"

NAME = "People's Front"

arch/arm/boot/compressed/libfdt_env.h

+3 −1
Original line number Original line Diff line number Diff line
@@ -2,11 +2,13 @@ 
#ifndef _ARM_LIBFDT_ENV_H

#ifndef _ARM_LIBFDT_ENV_H

#define _ARM_LIBFDT_ENV_H

#define _ARM_LIBFDT_ENV_H





#include <linux/limits.h>

#include <linux/types.h>

#include <linux/types.h>

#include <linux/string.h>

#include <linux/string.h>

#include <asm/byteorder.h>

#include <asm/byteorder.h>





#define INT_MAX			((int)(~0U>>1))

#define INT32_MAX	S32_MAX

#define UINT32_MAX	U32_MAX





typedef __be16 fdt16_t;

typedef __be16 fdt16_t;

typedef __be32 fdt32_t;

typedef __be32 fdt32_t;

arch/arm/boot/dts/am437x-gp-evm.dts

+1 −1
Original line number Original line Diff line number Diff line
@@ -83,7 +83,7 @@ 
		};

		};





	lcd0: display {

	lcd0: display {

		compatible = "osddisplays,osd057T0559-34ts", "panel-dpi";

		compatible = "osddisplays,osd070t1718-19ts", "panel-dpi";

		label = "lcd";

		label = "lcd";





		backlight = <&lcd_bl>;

		backlight = <&lcd_bl>;

arch/arm/boot/dts/am43x-epos-evm.dts

+1 −1
Original line number Original line Diff line number Diff line
@@ -45,7 +45,7 @@ 
	};

	};





	lcd0: display {

	lcd0: display {

		compatible = "osddisplays,osd057T0559-34ts", "panel-dpi";

		compatible = "osddisplays,osd070t1718-19ts", "panel-dpi";

		label = "lcd";

		label = "lcd";





		backlight = <&lcd_bl>;

		backlight = <&lcd_bl>;