Commit 58a59941 authored by popcornmix's avatar popcornmix
Browse files

Merge remote-tracking branch 'stable/linux-4.9.y' into rpi-4.9.y

parents 9a5f215e 58cd97ff

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 27

SUBLEVEL = 28

EXTRAVERSION =

NAME = Roaring Lionus

arch/arm/boot/dts/bcm958522er.dts

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ 
	gpio-restart {

		compatible = "gpio-restart";

		gpios = <&gpioa 15 GPIO_ACTIVE_LOW>;

		open-source;

		priority = <200>;

	};

};

arch/arm/boot/dts/bcm958525er.dts

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ 
	gpio-restart {

		compatible = "gpio-restart";

		gpios = <&gpioa 15 GPIO_ACTIVE_LOW>;

		open-source;

		priority = <200>;

	};

};

arch/arm/boot/dts/bcm958525xmc.dts

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ 
	gpio-restart {

		compatible = "gpio-restart";

		gpios = <&gpioa 31 GPIO_ACTIVE_LOW>;

		open-source;

		priority = <200>;

	};

};

arch/arm/boot/dts/bcm958622hr.dts

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ 
	gpio-restart {

		compatible = "gpio-restart";

		gpios = <&gpioa 15 GPIO_ACTIVE_LOW>;

		open-source;

		priority = <200>;

	};

};