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

Commit 1725e323 authored by Matt Wagantall's avatar Matt Wagantall
Browse files

Merge tag 'v3.18.5' into msm-3.18 



This is the 3.18.5 stable release

Resolve a conflict due to similar (but not identical)
array-out-of-bounds fixes in pinctrl-msm.c made upstream
and internally. Keep the upstream version.

Conflicts:
	drivers/pinctrl/qcom/pinctrl-msm.c

Change-Id: Ib8c2bce3963b1807c6937eb3bff48b7a1738dd6c
Signed-off-by: default avatarMatt Wagantall <mattw@codeaurora.org>
parents 4bf23520 c2d6598e

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 4

SUBLEVEL = 5

EXTRAVERSION =

NAME = Shuffling Zombie Juror

arch/arm/boot/dts/imx25.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ 
				compatible = "fsl,imx25-pwm", "fsl,imx27-pwm";

				#pwm-cells = <2>;

				reg = <0x53fa0000 0x4000>;

				clocks = <&clks 106>, <&clks 36>;

				clocks = <&clks 106>, <&clks 52>;

				clock-names = "ipg", "per";

				interrupts = <36>;

			};
@@ -388,7 +388,7 @@ 
				compatible = "fsl,imx25-pwm", "fsl,imx27-pwm";

				#pwm-cells = <2>;

				reg = <0x53fa8000 0x4000>;

				clocks = <&clks 107>, <&clks 36>;

				clocks = <&clks 107>, <&clks 52>;

				clock-names = "ipg", "per";

				interrupts = <41>;

			};
@@ -429,7 +429,7 @@ 
			pwm4: pwm@53fc8000 {

				compatible = "fsl,imx25-pwm", "fsl,imx27-pwm";

				reg = <0x53fc8000 0x4000>;

				clocks = <&clks 108>, <&clks 36>;

				clocks = <&clks 108>, <&clks 52>;

				clock-names = "ipg", "per";

				interrupts = <42>;

			};
@@ -476,7 +476,7 @@ 
				compatible = "fsl,imx25-pwm", "fsl,imx27-pwm";

				#pwm-cells = <2>;

				reg = <0x53fe0000 0x4000>;

				clocks = <&clks 105>, <&clks 36>;

				clocks = <&clks 105>, <&clks 52>;

				clock-names = "ipg", "per";

				interrupts = <26>;

			};

arch/arm/crypto/aes_glue.c

+2 −2
Original line number Diff line number Diff line
@@ -93,6 +93,6 @@ module_exit(aes_fini); 


MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm (ASM)");

MODULE_LICENSE("GPL");

MODULE_ALIAS("aes");

MODULE_ALIAS("aes-asm");

MODULE_ALIAS_CRYPTO("aes");

MODULE_ALIAS_CRYPTO("aes-asm");

MODULE_AUTHOR("David McCullough <ucdevel@gmail.com>");

arch/arm/crypto/sha1_glue.c

+1 −1
Original line number Diff line number Diff line
@@ -171,5 +171,5 @@ module_exit(sha1_mod_fini); 


MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm (ARM)");

MODULE_ALIAS("sha1");

MODULE_ALIAS_CRYPTO("sha1");

MODULE_AUTHOR("David McCullough <ucdevel@gmail.com>");

arch/arm/crypto/sha1_neon_glue.c

+1 −1
Original line number Diff line number Diff line
@@ -194,4 +194,4 @@ module_exit(sha1_neon_mod_fini); 


MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm, NEON accelerated");

MODULE_ALIAS("sha1");
 
MODULE_ALIAS_CRYPTO("sha1");