Commit 7b9f6da1 authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 



A function in kernel/bpf/syscall.c which got a bug fix in 'net'
was moved to kernel/bpf/verifier.c in 'net-next'.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 9868879f 1debdc8f

Makefile

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

PATCHLEVEL = 11

SUBLEVEL = 0

EXTRAVERSION = -rc6

EXTRAVERSION = -rc7

NAME = Fearless Coyote



# *DOCUMENTATION*

arch/arm/boot/dts/am335x-baltos.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -371,6 +371,8 @@ 


	phy1: ethernet-phy@1 {

		reg = <7>;

		eee-broken-100tx;

		eee-broken-1000t;

	};

};

arch/arm/boot/dts/am335x-evmsk.dts

+1 −0
Original line number Diff line number Diff line
@@ -672,6 +672,7 @@ 
	ti,non-removable;

	bus-width = <4>;

	cap-power-off-card;

	keep-power-in-suspend;

	pinctrl-names = "default";

	pinctrl-0 = <&mmc2_pins>;

arch/arm/boot/dts/dra7.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -283,6 +283,7 @@ 
				device_type = "pci";

				ranges = <0x81000000 0 0          0x03000 0 0x00010000

					  0x82000000 0 0x20013000 0x13000 0 0xffed000>;

				bus-range = <0x00 0xff>;

				#interrupt-cells = <1>;

				num-lanes = <1>;

				linux,pci-domain = <0>;
@@ -319,6 +320,7 @@ 
				device_type = "pci";

				ranges = <0x81000000 0 0          0x03000 0 0x00010000

					  0x82000000 0 0x30013000 0x13000 0 0xffed000>;

				bus-range = <0x00 0xff>;

				#interrupt-cells = <1>;

				num-lanes = <1>;

				linux,pci-domain = <1>;

arch/arm/boot/dts/logicpd-torpedo-som.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ 
&i2c3 {

	clock-frequency = <400000>;

	at24@50 {

		compatible = "at24,24c02";

		compatible = "atmel,24c64";

		readonly;

		reg = <0x50>;

	};