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

Commit ef93f7a1 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.4@4b8fc9f (v4.4.82) into msm-4.4"

parents 8027efd3 901bf6dd

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 80

SUBLEVEL = 82

EXTRAVERSION =

NAME = Blurry Fish Butt

android/configs/android-base.cfg

+0 −5
Original line number Diff line number Diff line
@@ -139,11 +139,6 @@ CONFIG_PPP_DEFLATE=y 
CONFIG_PPP_MPPE=y

CONFIG_PREEMPT=y

CONFIG_PROFILING=y

CONFIG_QFMT_V2=y

CONFIG_QUOTA=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

CONFIG_QUOTA_TREE=y

CONFIG_QUOTACTL=y

CONFIG_RANDOMIZE_BASE=y

CONFIG_RTC_CLASS=y

CONFIG_RT_GROUP_SCHED=y

android/configs/android-recommended.cfg

+5 −0
Original line number Diff line number Diff line
@@ -110,6 +110,11 @@ CONFIG_POWER_SUPPLY=y 
CONFIG_PSTORE=y

CONFIG_PSTORE_CONSOLE=y

CONFIG_PSTORE_RAM=y

CONFIG_QFMT_V2=y

CONFIG_QUOTA=y

CONFIG_QUOTACTL=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

CONFIG_QUOTA_TREE=y

CONFIG_SCHEDSTATS=y

CONFIG_SMARTJOYPLUS_FF=y

CONFIG_SND=y

arch/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -225,8 +225,8 @@ config ARCH_INIT_TASK 
config ARCH_TASK_STRUCT_ALLOCATOR

	bool



# Select if arch has its private alloc_thread_info() function

config ARCH_THREAD_INFO_ALLOCATOR

# Select if arch has its private alloc_thread_stack() function

config ARCH_THREAD_STACK_ALLOCATOR

	bool



# Select if arch wants to size task_struct dynamically via arch_task_struct_size:

arch/arm/boot/dts/armada-388-gp.dts

+2 −2
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ 
					pinctrl-names = "default";

					pinctrl-0 = <&pca0_pins>;

					interrupt-parent = <&gpio0>;

					interrupts = <18 IRQ_TYPE_EDGE_FALLING>;

					interrupts = <18 IRQ_TYPE_LEVEL_LOW>;

					gpio-controller;

					#gpio-cells = <2>;

					interrupt-controller;
@@ -101,7 +101,7 @@ 
					compatible = "nxp,pca9555";

					pinctrl-names = "default";

					interrupt-parent = <&gpio0>;

					interrupts = <18 IRQ_TYPE_EDGE_FALLING>;

					interrupts = <18 IRQ_TYPE_LEVEL_LOW>;

					gpio-controller;

					#gpio-cells = <2>;

					interrupt-controller;