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

Commit da676f5d authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge remote-tracking branch '4.9/tmp-23b839a4' into msm-4.9" into msm-4.9

parents 7a6c5fd7 deb64a7f

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 15

SUBLEVEL = 16

EXTRAVERSION =

NAME = Roaring Lionus

arch/mips/configs/ip22_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -67,8 +67,8 @@ CONFIG_NETFILTER_NETLINK_QUEUE=m 
CONFIG_NF_CONNTRACK=m

CONFIG_NF_CONNTRACK_SECMARK=y

CONFIG_NF_CONNTRACK_EVENTS=y

CONFIG_NF_CT_PROTO_DCCP=m

CONFIG_NF_CT_PROTO_UDPLITE=m

CONFIG_NF_CT_PROTO_DCCP=y

CONFIG_NF_CT_PROTO_UDPLITE=y

CONFIG_NF_CONNTRACK_AMANDA=m

CONFIG_NF_CONNTRACK_FTP=m

CONFIG_NF_CONNTRACK_H323=m

arch/mips/configs/ip27_defconfig

+1 −2
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ CONFIG_LIBFC=m 
CONFIG_SCSI_QLOGIC_1280=y

CONFIG_SCSI_PMCRAID=m

CONFIG_SCSI_BFA_FC=m

CONFIG_SCSI_DH=m

CONFIG_SCSI_DH=y

CONFIG_SCSI_DH_RDAC=m

CONFIG_SCSI_DH_HP_SW=m

CONFIG_SCSI_DH_EMC=m
@@ -205,7 +205,6 @@ CONFIG_MLX4_EN=m 
# CONFIG_MLX4_DEBUG is not set

CONFIG_TEHUTI=m

CONFIG_BNX2X=m

CONFIG_QLGE=m

CONFIG_SFC=m

CONFIG_BE2NET=m

CONFIG_LIBERTAS_THINFIRM=m

arch/mips/configs/lemote2f_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ CONFIG_HIBERNATION=y 
CONFIG_PM_STD_PARTITION="/dev/hda3"

CONFIG_CPU_FREQ=y

CONFIG_CPU_FREQ_DEBUG=y

CONFIG_CPU_FREQ_STAT=m

CONFIG_CPU_FREQ_STAT=y

CONFIG_CPU_FREQ_STAT_DETAILS=y

CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y

CONFIG_CPU_FREQ_GOV_POWERSAVE=m

arch/mips/configs/malta_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -59,8 +59,8 @@ CONFIG_NETFILTER=y 
CONFIG_NF_CONNTRACK=m

CONFIG_NF_CONNTRACK_SECMARK=y

CONFIG_NF_CONNTRACK_EVENTS=y

CONFIG_NF_CT_PROTO_DCCP=m

CONFIG_NF_CT_PROTO_UDPLITE=m

CONFIG_NF_CT_PROTO_DCCP=y

CONFIG_NF_CT_PROTO_UDPLITE=y

CONFIG_NF_CONNTRACK_AMANDA=m

CONFIG_NF_CONNTRACK_FTP=m

CONFIG_NF_CONNTRACK_H323=m