Commit 942e6f8a authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge mainline/master into arm/fixes 



This brings in the mainline tree right after armsoc contents was merged
this release cycle, so that we can re-run savedefconfig, etc.

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 336bab73 b08baef0

.gitattributes

+2 −0
Original line number Diff line number Diff line 
*.c   diff=cpp

*.h   diff=cpp

*.dtsi diff=dts

*.dts  diff=dts

.gitignore

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
*.lzo

*.mod

*.mod.c

*.ns_deps

*.o

*.o.*

*.patch
@@ -61,6 +60,7 @@ modules.order 
/System.map

/Module.markers

/modules.builtin.modinfo

/modules.nsdeps



#

# RPM spec file (make rpm-pkg)

.mailmap

+4 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ Andy Adamson <andros@citi.umich.edu> 
Antoine Tenart <antoine.tenart@free-electrons.com>

Antonio Ospite <ao2@ao2.it> <ao2@amarulasolutions.com>

Archit Taneja <archit@ti.com>

Ard Biesheuvel <ardb@kernel.org> <ard.biesheuvel@linaro.org>

Arnaud Patard <arnaud.patard@rtp-net.org>

Arnd Bergmann <arnd@arndb.de>

Axel Dyks <xl@xlsigned.net>
@@ -158,6 +159,7 @@ Mark Brown <broonie@sirena.org.uk> 
Mark Yao <markyao0591@gmail.com> <mark.yao@rock-chips.com>

Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>

Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>

Martin Kepplinger <martink@posteo.de> <martin.kepplinger@puri.sm>

Mathieu Othacehe <m.othacehe@gmail.com>

Matthew Wilcox <willy@infradead.org> <matthew.r.wilcox@intel.com>

Matthew Wilcox <willy@infradead.org> <matthew@wil.cx>
@@ -203,7 +205,8 @@ Oleksij Rempel <linux@rempel-privat.de> <o.rempel@pengutronix.de> 
Oleksij Rempel <linux@rempel-privat.de> <ore@pengutronix.de>

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

Patrick Mochel <mochel@digitalimplant.org>

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

Paul Burton <paulburton@kernel.org> <paul.burton@imgtec.com>

Paul Burton <paulburton@kernel.org> <paul.burton@mips.com>

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

Peter Oruba <peter@oruba.de>

Peter Oruba <peter.oruba@amd.com>

CREDITS

+2 −1
Original line number Diff line number Diff line
@@ -1875,8 +1875,9 @@ S: The Netherlands 


N: Martin Kepplinger

E: martink@posteo.de

E: martin.kepplinger@ginzinger.com

E: martin.kepplinger@puri.sm

W: http://www.martinkepplinger.com

P: 4096R/5AB387D3 F208 2B88 0F9E 4239 3468  6E3F 5003 98DF 5AB3 87D3

D: mma8452 accelerators iio driver

D: pegasus_notetaker input driver

D: Kernel fixes and cleanups

Documentation/ABI/stable/sysfs-class-infiniband

+0 −19
Original line number Diff line number Diff line
@@ -314,25 +314,6 @@ Description: 
		board_id:	(RO) Manufacturing board ID





sysfs interface for Chelsio T3 RDMA Driver (cxgb3)

--------------------------------------------------



What:		/sys/class/infiniband/cxgb3_X/hw_rev

What:		/sys/class/infiniband/cxgb3_X/hca_type

What:		/sys/class/infiniband/cxgb3_X/board_id

Date:		Feb, 2007

KernelVersion:	v2.6.21

Contact:	linux-rdma@vger.kernel.org

Description:

		hw_rev:		(RO) Hardware revision number



		hca_type:	(RO) HCA type. Here it is a driver short name.

				It should normally match the name in its bus

				driver structure (e.g.  pci_driver::name).



		board_id:	(RO) Manufacturing board id





sysfs interface for Mellanox ConnectX HCA IB driver (mlx4)

----------------------------------------------------------