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

Commit 0a134125 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.14-p.103 (d38adba7) into msm-4.14"

parents e2511c8c 272c9b5a

Documentation/devicetree/bindings/eeprom/eeprom.txt

+3 −2
Original line number Diff line number Diff line
@@ -6,7 +6,8 @@ Required properties: 


	"atmel,24c00", "atmel,24c01", "atmel,24c02", "atmel,24c04",

	"atmel,24c08", "atmel,24c16", "atmel,24c32", "atmel,24c64",

	"atmel,24c128", "atmel,24c256", "atmel,24c512", "atmel,24c1024"

	"atmel,24c128", "atmel,24c256", "atmel,24c512", "atmel,24c1024",

	"atmel,24c2048"



	"catalyst,24c32"
@@ -23,7 +24,7 @@ Required properties: 
	 device with <type> and manufacturer "atmel" should be used.

	 Possible types are:

	 "24c00", "24c01", "24c02", "24c04", "24c08", "24c16", "24c32", "24c64",

	 "24c128", "24c256", "24c512", "24c1024", "spd"

	 "24c128", "24c256", "24c512", "24c1024", "24c2048", "spd"



  - reg : the I2C address of the EEPROM

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 98

SUBLEVEL = 103

EXTRAVERSION =

NAME = Petit Gorille

arch/alpha/include/asm/irq.h

+3 −3
Original line number Diff line number Diff line
@@ -56,15 +56,15 @@ 


#elif defined(CONFIG_ALPHA_DP264) || \

      defined(CONFIG_ALPHA_LYNX)  || \

      defined(CONFIG_ALPHA_SHARK) || \

      defined(CONFIG_ALPHA_EIGER)

      defined(CONFIG_ALPHA_SHARK)

# define NR_IRQS	64



#elif defined(CONFIG_ALPHA_TITAN)

#define NR_IRQS		80



#elif defined(CONFIG_ALPHA_RAWHIDE) || \

	defined(CONFIG_ALPHA_TAKARA)

      defined(CONFIG_ALPHA_TAKARA) || \

      defined(CONFIG_ALPHA_EIGER)

# define NR_IRQS	128



#elif defined(CONFIG_ALPHA_WILDFIRE)

arch/alpha/mm/fault.c

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ __load_new_mm_context(struct mm_struct *next_mm) 
/* Macro for exception fixup code to access integer registers.  */

#define dpf_reg(r)							\

	(((unsigned long *)regs)[(r) <= 8 ? (r) : (r) <= 15 ? (r)-16 :	\

				 (r) <= 18 ? (r)+8 : (r)-10])

				 (r) <= 18 ? (r)+10 : (r)-10])



asmlinkage void

do_page_fault(unsigned long address, unsigned long mmcsr,

arch/arm/boot/dts/da850-evm.dts

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ 


	sound {

		compatible = "simple-audio-card";

		simple-audio-card,name = "DA850/OMAP-L138 EVM";

		simple-audio-card,name = "DA850-OMAPL138 EVM";

		simple-audio-card,widgets =

			"Line", "Line In",

			"Line", "Line Out";