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

Commit 5bc0b123 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 3.11-rc6 into char-misc-next 



We want these fixes in this tree.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents eefbc594 b36f4be3

.gitignore

+1 −0
Original line number Original line Diff line number Diff line
@@ -29,6 +29,7 @@ modules.builtin 
*.bz2

*.bz2

*.lzma

*.lzma

*.xz

*.xz

*.lz4

*.lzo

*.lzo

*.patch

*.patch

*.gcno

*.gcno

Documentation/DocBook/device-drivers.tmpl

+1 −1
Original line number Original line Diff line number Diff line
@@ -84,7 +84,7 @@ X!Iinclude/linux/kobject.h 




     <sect1><title>Kernel utility functions</title>

     <sect1><title>Kernel utility functions</title>

!Iinclude/linux/kernel.h

!Iinclude/linux/kernel.h

!Ekernel/printk.c

!Ekernel/printk/printk.c

!Ekernel/panic.c

!Ekernel/panic.c

!Ekernel/sys.c

!Ekernel/sys.c

!Ekernel/rcupdate.c

!Ekernel/rcupdate.c

Documentation/DocBook/media_api.tmpl

+2 −2
Original line number Original line Diff line number Diff line 
<?xml version="1.0"?>

<?xml version="1.0"?>

<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"

<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"

	"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [

	"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [

<!ENTITY % media-entities SYSTEM "./media-entities.tmpl"> %media-entities;

<!ENTITY % media-entities SYSTEM "./media-entities.tmpl"> %media-entities;

<!ENTITY media-indices SYSTEM "./media-indices.tmpl">

<!ENTITY media-indices SYSTEM "./media-indices.tmpl">

Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -4,7 +4,7 @@ 
Required properties :

Required properties :





 - reg             : Offset and length of the register set for the device

 - reg             : Offset and length of the register set for the device

 - compatible      : Should be "marvell,mv64xxx-i2c"

 - compatible      : Should be "marvell,mv64xxx-i2c" or "allwinner,sun4i-i2c"

 - interrupts      : The interrupt number

 - interrupts      : The interrupt number





Optional properties :

Optional properties :

Documentation/devicetree/bindings/regulator/palmas-pmic.txt

+1 −3
Original line number Original line Diff line number Diff line
@@ -31,9 +31,8 @@ Optional nodes: 
	       Optional sub-node properties:

	       Optional sub-node properties:

	       ti,warm-reset - maintain voltage during warm reset(boolean)

	       ti,warm-reset - maintain voltage during warm reset(boolean)

	       ti,roof-floor - control voltage selection by pin(boolean)

	       ti,roof-floor - control voltage selection by pin(boolean)

	       ti,sleep-mode - mode to adopt in pmic sleep 0 - off, 1 - auto,

	       ti,mode-sleep - mode to adopt in pmic sleep 0 - off, 1 - auto,

	       2 - eco, 3 - forced pwm

	       2 - eco, 3 - forced pwm

	       ti,tstep - slope control 0 - Jump, 1 10mV/us, 2 5mV/us, 3 2.5mV/us

	       ti,smps-range - OTP has the wrong range set for the hardware so override

	       ti,smps-range - OTP has the wrong range set for the hardware so override

	       0 - low range, 1 - high range.

	       0 - low range, 1 - high range.
@@ -59,7 +58,6 @@ pmic { 
			ti,warm-reset;

			ti,warm-reset;

			ti,roof-floor;

			ti,roof-floor;

			ti,mode-sleep = <0>;

			ti,mode-sleep = <0>;

			ti,tstep = <0>;

			ti,smps-range = <1>;

			ti,smps-range = <1>;

		};

		};