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

Commit cc9b9402 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'topic/error' of... 

Merge branch 'topic/error' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-fixed
parents 13bed58c 1b5b4221

.cocciconfig

0 → 100644
+3 −0
Original line number Diff line number Diff line 
[spatch]

	options = --timeout 200

	options = --use-gitgrep

.gitattributes

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

*.h   diff=cpp

.gitignore

+2 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ modules.builtin 
Module.symvers

*.dwo

*.su

*.c.[012]*.*



#

# Top-level generic files
@@ -66,6 +67,7 @@ Module.symvers 
#

!.gitignore

!.mailmap

!.cocciconfig



#

# Generated include files

.mailmap

+28 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ Aaron Durbin <adurbin@google.com> 
Adam Oldham <oldhamca@gmail.com>

Adam Radford <aradford@gmail.com>

Adrian Bunk <bunk@stusta.de>

Adriana Reus <adi.reus@gmail.com> <adriana.reus@intel.com>

Alan Cox <alan@lxorguk.ukuu.org.uk>

Alan Cox <root@hraefn.swansea.linux.org.uk>

Aleksey Gorelov <aleksey_gorelov@phoenix.com>
@@ -21,6 +22,7 @@ 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>

Antoine Tenart <antoine.tenart@free-electrons.com>

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

Archit Taneja <archit@ti.com>

Arnaud Patard <arnaud.patard@rtp-net.org>
@@ -30,6 +32,9 @@ Axel Lin <axel.lin@gmail.com> 
Ben Gardner <bgardner@wabtec.com>

Ben M Cahill <ben.m.cahill@intel.com>

Björn Steinbrink <B.Steinbrink@gmx.de>

Boris Brezillon <boris.brezillon@free-electrons.com>

Boris Brezillon <boris.brezillon@free-electrons.com> <b.brezillon.dev@gmail.com>

Boris Brezillon <boris.brezillon@free-electrons.com> <b.brezillon@overkiz.com>

Brian Avery <b.avery@hp.com>

Brian King <brking@us.ibm.com>

Christoph Hellwig <hch@lst.de>
@@ -64,11 +69,14 @@ James Bottomley <jejb@mulgrave.(none)> 
James Bottomley <jejb@titanic.il.steeleye.com>

James E Wilson <wilson@specifix.com>

James Ketrenos <jketreno@io.(none)>

Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>

<javier@osg.samsung.com> <javier.martinez@collabora.co.uk>

Jean Tourrilhes <jt@hpl.hp.com>

Jeff Garzik <jgarzik@pretzel.yyz.us>

Jens Axboe <axboe@suse.de>

Jens Osterkamp <Jens.Osterkamp@de.ibm.com>

Johan Hovold <johan@kernel.org> <jhovold@gmail.com>

Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>

John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>

John Stultz <johnstul@us.ibm.com>

<josh@joshtriplett.org> <josh@freedesktop.org>
@@ -83,12 +91,24 @@ Kay Sievers <kay.sievers@vrfy.org> 
Kenneth W Chen <kenneth.w.chen@intel.com>

Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>

Koushik <raghavendra.koushik@neterion.com>

Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>

Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>

Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Leonid I Ananiev <leonid.i.ananiev@intel.com>

Linas Vepstas <linas@austin.ibm.com>

Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>

Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>

Mark Brown <broonie@sirena.org.uk>

Matthieu CASTET <castet.matthieu@free.fr>

Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@brturbo.com.br>

Mauro Carvalho Chehab <mchehab@kernel.org> <maurochehab@gmail.com>

Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@infradead.org>

Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@redhat.com>

Mauro Carvalho Chehab <mchehab@kernel.org> <m.chehab@samsung.com>

Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@osg.samsung.com>

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>

Mayuresh Janorkar <mayur@ti.com>

Michael Buesch <m@bues.ch>

Michel Dänzer <michel@tungstengraphics.com>
@@ -107,6 +127,7 @@ Peter Oruba <peter@oruba.de> 
Peter Oruba <peter.oruba@amd.com>

Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com>

Praveen BP <praveenbp@ti.com>

Qais Yousef <qsyousef@gmail.com> <qais.yousef@imgtec.com>

Rajesh Shah <rajesh.shah@intel.com>

Ralf Baechle <ralf@linux-mips.org>

Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
@@ -122,6 +143,10 @@ Santosh Shilimkar <santosh.shilimkar@oracle.org> 
Sascha Hauer <s.hauer@pengutronix.de>

S.Çağlar Onur <caglar@pardus.org.tr>

Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>

Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com>

Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com>

Shuah Khan <shuah@kernel.org> <shuahkh@osg.samsung.com>

Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com>

Simon Kelley <simon@thekelleys.org.uk>

Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>

Stephen Hemminger <shemminger@osdl.org>
@@ -138,6 +163,9 @@ Valdis Kletnieks <Valdis.Kletnieks@vt.edu> 
Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com>

Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com>

Viresh Kumar <vireshk@kernel.org> <viresh.kumar2@arm.com>

Vlad Dogaru <ddvlad@gmail.com> <vlad.dogaru@intel.com>

Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>

Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>

Takashi YOSHII <takashi.yoshii.zj@renesas.com>

Yusuke Goda <goda.yusuke@renesas.com>

Gustavo Padovan <gustavo@las.ic.unicamp.br>

CREDITS

+23 −5
Original line number Diff line number Diff line
@@ -649,6 +649,7 @@ D: Configure, Menuconfig, xconfig 


N: Mauro Carvalho Chehab

E: m.chehab@samsung.org

E: mchehab@osg.samsung.com

E: mchehab@infradead.org

D: Media subsystem (V4L/DVB) drivers and core

D: EDAC drivers and EDAC 3.0 core rework
@@ -1089,6 +1090,10 @@ S: 6350 Stoneridge Mall Road 
S: Pleasanton, CA 94588

S: USA



N: Dmitry Eremin-Solenikov

E: dbaryshkov@gmail.com

D: Power Supply Maintainer from v3.14 - v3.15



N: Doug Evans

E: dje@cygnus.com

D: Wrote Xenix FS (part of standard kernel since 0.99.15)
@@ -1943,6 +1948,11 @@ E: kraxel@bytesex.org 
E: kraxel@suse.de

D: video4linux, bttv, vesafb, some scsi, misc fixes



N: Hans J. Koch

D: USERSPACE I/O, MAX6650

D: Hans passed away in June 2016, and will be greatly missed.

W: https://lwn.net/Articles/691000/



N: Harald Koenig

E: koenig@tat.physik.uni-tuebingen.de

D: XFree86 (S3), DCF77, some kernel hacks and fixes
@@ -2286,11 +2296,11 @@ D: Initial implementation of VC's, pty's and select() 


N: Pavel Machek

E: pavel@ucw.cz

D: Softcursor for vga, hypertech cdrom support, vcsa bugfix, nbd

P: 4096R/92DFCE96 4FA7 9EEF FCD4 C44F C585  B8C7 C060 2241 92DF CE96

D: Softcursor for vga, hypertech cdrom support, vcsa bugfix, nbd,

D: sun4/330 port, capabilities for elf, speedup for rm on ext2, USB,

D: work on suspend-to-ram/disk, killing duplicates from ioctl32

S: Volkova 1131

S: 198 00 Praha 9

D: work on suspend-to-ram/disk, killing duplicates from ioctl32,

D: Altera SoCFPGA and Nokia N900 support.

S: Czech Republic



N: Paul Mackerras
@@ -3517,6 +3527,10 @@ S: 145 Howard St. 
S: Northborough, MA 01532

S: USA



N: Doug Thompson

E: dougthompson@xmission.com

D: EDAC



N: Tommy Thorn

E: Tommy.Thorn@irisa.fr

W: http://www.irisa.fr/prive/thorn/index.html
@@ -3653,6 +3667,10 @@ S: Obere Heerbergstrasse 17 
S: 97078 Wuerzburg

S: Germany



N: Jason Uhlenkott

E: juhlenko@akamai.com

D: I3000 EDAC driver



N: Greg Ungerer

E: gerg@snapgear.com

D: uClinux kernel hacker
@@ -3690,7 +3708,7 @@ S: Germany 
N: Geert Uytterhoeven

E: geert@linux-m68k.org

W: http://users.telenet.be/geertu/

P: 1024/862678A6 C51D 361C 0BD1 4C90 B275  C553 6EEA 11BA 8626 78A6

P: 4096R/4804B4BC3F55EEFB 750D 82B0 A781 5431 5E25  925B 4804 B4BC 3F55 EEFB

D: m68k/Amiga and PPC/CHRP Longtrail coordinator

D: Frame buffer device and XF68_FBDev maintainer

D: m68k IDE maintainer