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

Commit 296628bc 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.117 (4ec36565) into msm-4.4"

parents d30c02ed ac86a6d6

Documentation/devicetree/bindings/dma/snps-dma.txt

+1 −1
Original line number Diff line number Diff line
@@ -58,6 +58,6 @@ Example: 
		interrupts = <0 35 0x4>;

		status = "disabled";

		dmas = <&dmahost 12 0 1>,

			<&dmahost 13 0 1 0>;

			<&dmahost 13 1 0>;

		dma-names = "rx", "rx";

	};

Documentation/filesystems/ext4.txt

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ data_err=ignore(*) Just print an error message if an error occurs 
data_err=abort		Abort the journal if an error occurs in a file

			data buffer in ordered mode.



grpid			Give objects the same group ID as their creator.

grpid			New objects have the group ID of their parent.

bsdgroups



nogrpid		(*)	New objects have the group ID of their creator.

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 116

SUBLEVEL = 117

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arm/boot/dts/s5pv210.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -461,6 +461,7 @@ 
			compatible = "samsung,exynos4210-ohci";

			reg = <0xec300000 0x100>;

			interrupts = <23>;

			interrupt-parent = <&vic1>;

			clocks = <&clocks CLK_USB_HOST>;

			clock-names = "usbhost";

			#address-cells = <1>;

arch/arm/boot/dts/spear1310-evb.dts

+1 −1
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ 
			spi0: spi@e0100000 {

				status = "okay";

				num-cs = <3>;

				cs-gpios = <&gpio1 7 0>, <&spics 0>, <&spics 1>;

				cs-gpios = <&gpio1 7 0>, <&spics 0 0>, <&spics 1 0>;



				stmpe610@0 {

					compatible = "st,stmpe610";