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

Commit 1f6a2b80 authored by Alex Shi's avatar Alex Shi
Browse files

Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-android 

Conflicts:
	keep -fno-pic flag in arch/arm64/Makefile
parents b52e1c65 e9cd0f1c

Documentation/filesystems/efivarfs.txt

+7 −0
Original line number Diff line number Diff line
@@ -14,3 +14,10 @@ filesystem. 
efivarfs is typically mounted like this,



	mount -t efivarfs none /sys/firmware/efi/efivars



Due to the presence of numerous firmware bugs where removing non-standard

UEFI variables causes the system firmware to fail to POST, efivarfs

files that are not well-known standardized variables are created

as immutable files.  This doesn't prevent removal - "chattr -i" will work -

but it does prevent this kind of failure from being accomplished

accidentally.

MAINTAINERS

+3 −1
Original line number Diff line number Diff line
@@ -9020,10 +9020,12 @@ S: Maintained 
F:	drivers/net/ethernet/dlink/sundance.c



SUPERH

M:	Yoshinori Sato <ysato@users.sourceforge.jp>

M:	Rich Felker <dalias@libc.org>

L:	linux-sh@vger.kernel.org

W:	http://www.linux-sh.org

Q:	http://patchwork.kernel.org/project/linux-sh/list/

S:	Orphan

S:	Maintained

F:	Documentation/sh/

F:	arch/sh/

F:	drivers/sh/

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 30

SUBLEVEL = 31

EXTRAVERSION =

NAME = Shuffling Zombie Juror

arch/arm/boot/dts/armada-375.dtsi

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



			sata@a0000 {

				compatible = "marvell,orion-sata";

				compatible = "marvell,armada-370-sata";

				reg = <0xa0000 0x5000>;

				interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&gateclk 14>, <&gateclk 20>;

arch/arm/boot/dts/sun5i-a10s.dtsi

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



		rtp: rtp@01c25000 {

			compatible = "allwinner,sun4i-a10-ts";

			compatible = "allwinner,sun5i-a13-ts";

			reg = <0x01c25000 0x100>;

			interrupts = <29>;

		};