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

Commit becfc3c8 authored Jun 30, 2015 by Grant Likely

Merge remote-tracking branch 'robh/for-next' into devicetree/next

parents ce32f859 0b34c1a4

Documentation/devicetree/bindings/mfd/tps6507x.txt

100755 → 100644

+0 −0

File mode changed from 100755 to 100644.

Documentation/devicetree/bindings/pinctrl/lantiq,falcon-pinumx.txt→Documentation/devicetree/bindings/pinctrl/lantiq,pinctrl-falcon.txt

+0 −0

File moved.

Documentation/devicetree/bindings/pinctrl/lantiq,xway-pinumx.txt→Documentation/devicetree/bindings/pinctrl/lantiq,pinctrl-xway.txt

+0 −0

File moved.

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -211,3 +211,4 @@ xillybus Xillybus Ltd.
		xlnx Xilinx
		zyxel ZyXEL Communications Corp.
		zarlink Zarlink Semiconductor
		zii Zodiac Inflight Innovations

arch/arm/boot/compressed/libfdt_env.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -5,6 +5,10 @@
		#include <linux/string.h>
		#include <asm/byteorder.h>

		typedef __be16 fdt16_t;
		typedef __be32 fdt32_t;
		typedef __be64 fdt64_t;

		#define fdt16_to_cpu(x) be16_to_cpu(x)
		#define cpu_to_fdt16(x) cpu_to_be16(x)
		#define fdt32_to_cpu(x) be32_to_cpu(x)