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

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



Files removed in 'net-next' had their license header updated
in 'net'.  We take the remove from 'net-next'.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents bf534588 d4c2e9fc

.mailmap

+3 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ Corey Minyard <minyard@acm.org> 
Damian Hobson-Garcia <dhobsong@igel.co.jp>

David Brownell <david-b@pacbell.net>

David Woodhouse <dwmw2@shinybook.infradead.org>

Deng-Cheng Zhu <dengcheng.zhu@mips.com> <dengcheng.zhu@imgtec.com>

Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

Domen Puncer <domen@coderock.org>

Douglas Gilbert <dougg@torque.net>
@@ -114,6 +115,7 @@ Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@s-opensource.com> 
Matt Ranostay <mranostay@gmail.com> Matthew Ranostay <mranostay@embeddedalley.com>

Matt Ranostay <mranostay@gmail.com> <matt.ranostay@intel.com>

Matt Ranostay <matt.ranostay@konsulko.com> <matt@ranostay.consulting>

Matt Redfearn <matt.redfearn@mips.com> <matt.redfearn@imgtec.com>

Mayuresh Janorkar <mayur@ti.com>

Michael Buesch <m@bues.ch>

Michel Dänzer <michel@tungstengraphics.com>
@@ -127,6 +129,7 @@ Mythri P K <mythripk@ti.com> 
Nguyen Anh Quynh <aquynh@gmail.com>

Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>

Patrick Mochel <mochel@digitalimplant.org>

Paul Burton <paul.burton@mips.com> <paul.burton@imgtec.com>

Peter A Jonsson <pj@ludd.ltu.se>

Peter Oruba <peter@oruba.de>

Peter Oruba <peter.oruba@amd.com>

Documentation/ABI/testing/sysfs-class-remoteproc

+2 −2
Original line number Diff line number Diff line 
What:		/sys/class/remoteproc/.../firmware

Date:		October 2016

Contact:	Matt Redfearn <matt.redfearn@imgtec.com>

Contact:	Matt Redfearn <matt.redfearn@mips.com>

Description:	Remote processor firmware



		Reports the name of the firmware currently loaded to the
@@ -11,7 +11,7 @@ Description: Remote processor firmware 


What:		/sys/class/remoteproc/.../state

Date:		October 2016

Contact:	Matt Redfearn <matt.redfearn@imgtec.com>

Contact:	Matt Redfearn <matt.redfearn@mips.com>

Description:	Remote processor state



		Reports the state of the remote processor, which will be one of:

Kbuild

+1 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

#

# Kbuild for top-level directory of the kernel

# This file takes care of the following:

Kconfig

+1 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

#

# For a description of the syntax of this configuration file,

# see Documentation/kbuild/kconfig-language.txt.

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -6740,7 +6740,7 @@ S: Maintained 
F:	drivers/usb/atm/ueagle-atm.c



IMGTEC ASCII LCD DRIVER

M:	Paul Burton <paul.burton@imgtec.com>

M:	Paul Burton <paul.burton@mips.com>

S:	Maintained

F:	Documentation/devicetree/bindings/auxdisplay/img-ascii-lcd.txt

F:	drivers/auxdisplay/img-ascii-lcd.c
@@ -9001,7 +9001,7 @@ F: Documentation/mips/ 
F:	arch/mips/



MIPS BOSTON DEVELOPMENT BOARD

M:	Paul Burton <paul.burton@imgtec.com>

M:	Paul Burton <paul.burton@mips.com>

L:	linux-mips@linux-mips.org

S:	Maintained

F:	Documentation/devicetree/bindings/clock/img,boston-clock.txt
@@ -9011,7 +9011,7 @@ F: drivers/clk/imgtec/clk-boston.c 
F:	include/dt-bindings/clock/boston-clock.h



MIPS GENERIC PLATFORM

M:	Paul Burton <paul.burton@imgtec.com>

M:	Paul Burton <paul.burton@mips.com>

L:	linux-mips@linux-mips.org

S:	Supported

F:	arch/mips/generic/