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

Commit ac101ade authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.9.128 (ba01a425) into msm-4.9"

parents d1f0690a a80f4c8c

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 127

SUBLEVEL = 128

EXTRAVERSION =

NAME = Roaring Lionus

arch/arc/configs/axs101_defconfig

+0 −1
Original line number Diff line number Diff line 
CONFIG_DEFAULT_HOSTNAME="ARCLinux"

# CONFIG_SWAP is not set

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

# CONFIG_CROSS_MEMORY_ATTACH is not set

arch/arc/configs/axs103_defconfig

+0 −1
Original line number Diff line number Diff line 
CONFIG_DEFAULT_HOSTNAME="ARCLinux"

# CONFIG_SWAP is not set

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

# CONFIG_CROSS_MEMORY_ATTACH is not set

arch/arc/configs/axs103_smp_defconfig

+0 −1
Original line number Diff line number Diff line 
CONFIG_DEFAULT_HOSTNAME="ARCLinux"

# CONFIG_SWAP is not set

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

# CONFIG_CROSS_MEMORY_ATTACH is not set

arch/mips/cavium-octeon/octeon-platform.c

+2 −0
Original line number Diff line number Diff line
@@ -366,6 +366,7 @@ static int __init octeon_ehci_device_init(void) 
		return 0;



	pd = of_find_device_by_node(ehci_node);

	of_node_put(ehci_node);

	if (!pd)

		return 0;
@@ -428,6 +429,7 @@ static int __init octeon_ohci_device_init(void) 
		return 0;



	pd = of_find_device_by_node(ohci_node);

	of_node_put(ohci_node);

	if (!pd)

		return 0;