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

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



Conflicts:
	drivers/net/usb/qmi_wwan.c

Overlapping additions of new device IDs to qmi_wwan.c

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1a69205c 0bad9098

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ Aleksey Gorelov <aleksey_gorelov@phoenix.com> 
Al Viro <viro@ftp.linux.org.uk>

Al Viro <viro@zenIV.linux.org.uk>

Andreas Herrmann <aherrman@de.ibm.com>

Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com>

Andrew Morton <akpm@linux-foundation.org>

Andrew Vasquez <andrew.vasquez@qlogic.com>

Andy Adamson <andros@citi.umich.edu>

Documentation/devicetree/bindings/arm/cpus.txt

+1 −0
Original line number Diff line number Diff line
@@ -199,6 +199,7 @@ nodes to be present and contain the properties described below. 
			    "qcom,kpss-acc-v1"

			    "qcom,kpss-acc-v2"

			    "rockchip,rk3066-smp"

			    "ste,dbx500-smp"



	- cpu-release-addr

		Usage: required for systems that have an "enable-method"

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -3588,6 +3588,15 @@ S: Maintained 
F:	drivers/gpu/drm/rockchip/

F:	Documentation/devicetree/bindings/video/rockchip*



DRM DRIVERS FOR STI

M:	Benjamin Gaignard <benjamin.gaignard@linaro.org>

M:	Vincent Abriou <vincent.abriou@st.com>

L:	dri-devel@lists.freedesktop.org

T:	git http://git.linaro.org/people/benjamin.gaignard/kernel.git

S:	Maintained

F:	drivers/gpu/drm/sti

F:	Documentation/devicetree/bindings/gpu/st,stih4xx.txt



DSBR100 USB FM RADIO DRIVER

M:	Alexey Klimov <klimov.linux@gmail.com>

L:	linux-media@vger.kernel.org

Makefile

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

PATCHLEVEL = 2

SUBLEVEL = 0

EXTRAVERSION = -rc6

EXTRAVERSION = -rc7

NAME = Hurr durr I'ma sheep



# *DOCUMENTATION*

arch/arm/boot/dts/dra7.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ 
				ranges = <0 0x2000 0x2000>;



				scm_conf: scm_conf@0 {

					compatible = "syscon";

					compatible = "syscon", "simple-bus";

					reg = <0x0 0x1400>;

					#address-cells = <1>;

					#size-cells = <1>;