diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-21 13:18:44 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-21 13:18:44 -0800 |
| commit | 817de6b85914a3dda72b971c074d4d342965fba0 (patch) | |
| tree | df0a4563a04aadb8f8595f72392d66d65797c455 /.mailmap | |
| parent | 7dc7967fc39af81191558f63eeaf3d2b83899b1c (diff) | |
| parent | 085b7755808aa11f78ab9377257e1dad2e6fa4bb (diff) | |
| download | linux-stable-817de6b85914a3dda72b971c074d4d342965fba0.tar.gz linux-stable-817de6b85914a3dda72b971c074d4d342965fba0.tar.bz2 linux-stable-817de6b85914a3dda72b971c074d4d342965fba0.tar.xz linux-stable-817de6b85914a3dda72b971c074d4d342965fba0.zip | |
Merge 5.1-rc6 into staging-next
We want the fixes in here as well as this resolves an iio driver merge
issue.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to '.mailmap')
| -rw-r--r-- | .mailmap | 2 |
1 files changed, 2 insertions, 0 deletions
| @@ -156,6 +156,8 @@ Morten Welinder <welinder@darter.rentec.com> | |||
| 156 | Morten Welinder <welinder@troll.com> | 156 | Morten Welinder <welinder@troll.com> |
| 157 | Mythri P K <mythripk@ti.com> | 157 | Mythri P K <mythripk@ti.com> |
| 158 | Nguyen Anh Quynh <aquynh@gmail.com> | 158 | Nguyen Anh Quynh <aquynh@gmail.com> |
| 159 | Nicolas Pitre <nico@fluxnic.net> <nicolas.pitre@linaro.org> | ||
| 160 | Nicolas Pitre <nico@fluxnic.net> <nico@linaro.org> | ||
| 159 | Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> | 161 | Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> |
| 160 | Patrick Mochel <mochel@digitalimplant.org> | 162 | Patrick Mochel <mochel@digitalimplant.org> |
| 161 | Paul Burton <paul.burton@mips.com> <paul.burton@imgtec.com> | 163 | Paul Burton <paul.burton@mips.com> <paul.burton@imgtec.com> |