aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-06-29 18:35:01 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-06-29 18:35:01 -0400
commit3c9a6793bde1feb368cd6ef113c08a40a37f7517 (patch)
tree3c50e466061b31fe836faf023e3f194eea6196f6 /.mailmap
parent9989b59961a8ad55d92df4588b556f0c6c838ec7 (diff)
parent67626cc1a0f7bd6700b6f2f547244382247f5bb3 (diff)
Merge tag 'iio-for-4.8b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next
Jonathan writes: Second round of new iio device support, features and cleanups in the 4.8 cycle Firstly some contact detail updates: * NXP took over freescale. Update the mma8452 header to reflect this. * Martin Kepplinger email address change in mma8452 header. * Adriana Reus has changed email address. Update .mailmap. * Matt Ranostay has changed email address. Update .mailmap. New Device Support * max1363 - add the missing i2c_device_ids for a couple of parts so they can actually be used. * ms5867 - add device ids for ms5805 and ms5837 parts. New Features * ad5755 - DT support. This one was a bit controversial and under review for a long time. Still no one could come up with a better solution. * stx104 - add gpio support * ti-adc081c - Add ACPI device ID matching. Core changes * Refuse to register triggers with duplicate names. There is no way to distinguish between them so this makes no sense. A few drivers do not generate unique names for each instance of the device present. We can't fix this without changing ABI so leave them and wait for someone to actually take the rare step of two identical accelerometers on the same board. * buffer-dma - use ARRAY_SIZE in a few appropriate locations. Tools * Fix the fact that the --trigger-num option in generic_buffer didn't allow 0 which is perfectly valid in the ABI. Cleanups * as3935 - improve error reporting. - remove redundant zeroing of a field in iio_priv. * gp2ap020a00f - use the iio_device_claim_*_mode helpers rather than open coding locking around mode changes. * isl29125 - use the iio_device_claim_*_mode helpers rather than open coding locking. * lidar - use the iio_device_claim_*_mode helpers rather than open coding locking. * mma8452 - more detail in devices supported description in comments (addresses and similar) * sca3000 - add a missing error check. * tcs3414 - use the iio_device_claim_*_mode helpers rather than open coding locking. * tcs3472 - use the iio_device_claim_*_mode helpers rather than open coding locking.
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap3
1 files changed, 3 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 779a9caadc7f..6c3d82dae24a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -11,6 +11,7 @@ Aaron Durbin <adurbin@google.com>
11Adam Oldham <oldhamca@gmail.com> 11Adam Oldham <oldhamca@gmail.com>
12Adam Radford <aradford@gmail.com> 12Adam Radford <aradford@gmail.com>
13Adrian Bunk <bunk@stusta.de> 13Adrian Bunk <bunk@stusta.de>
14Adriana Reus <adi.reus@gmail.com> <adriana.reus@intel.com>
14Alan Cox <alan@lxorguk.ukuu.org.uk> 15Alan Cox <alan@lxorguk.ukuu.org.uk>
15Alan Cox <root@hraefn.swansea.linux.org.uk> 16Alan Cox <root@hraefn.swansea.linux.org.uk>
16Aleksey Gorelov <aleksey_gorelov@phoenix.com> 17Aleksey Gorelov <aleksey_gorelov@phoenix.com>
@@ -90,6 +91,8 @@ Linas Vepstas <linas@austin.ibm.com>
90Mark Brown <broonie@sirena.org.uk> 91Mark Brown <broonie@sirena.org.uk>
91Matthieu CASTET <castet.matthieu@free.fr> 92Matthieu CASTET <castet.matthieu@free.fr>
92Mauro Carvalho Chehab <mchehab@kernel.org> <maurochehab@gmail.com> <mchehab@infradead.org> <mchehab@redhat.com> <m.chehab@samsung.com> <mchehab@osg.samsung.com> <mchehab@s-opensource.com> 93Mauro Carvalho Chehab <mchehab@kernel.org> <maurochehab@gmail.com> <mchehab@infradead.org> <mchehab@redhat.com> <m.chehab@samsung.com> <mchehab@osg.samsung.com> <mchehab@s-opensource.com>
94Matt Ranostay <mranostay@gmail.com> Matthew Ranostay <mranostay@embeddedalley.com>
95Matt Ranostay <mranostay@gmail.com> <matt.ranostay@intel.com>
93Mayuresh Janorkar <mayur@ti.com> 96Mayuresh Janorkar <mayur@ti.com>
94Michael Buesch <m@bues.ch> 97Michael Buesch <m@bues.ch>
95Michel Dänzer <michel@tungstengraphics.com> 98Michel Dänzer <michel@tungstengraphics.com>