diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-04-10 09:21:55 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-04-10 09:21:55 -0400 |
| commit | f78a8236c6502760705399dfa42e22ab11aa1e6b (patch) | |
| tree | d965f09daff0d531c63e35c764e7061f9c43afe7 /.mailmap | |
| parent | 6cb3d05f3030deed157c9bbada5c58e7ee0f5172 (diff) | |
| parent | 39da7c509acff13fc8cb12ec1bb20337c988ed36 (diff) | |
Merge 4.11-rc6 into staging-next
We want the staging and iio fixes in here to handle merging easier.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to '.mailmap')
| -rw-r--r-- | .mailmap | 1 |
1 files changed, 1 insertions, 0 deletions
| @@ -172,6 +172,7 @@ Vlad Dogaru <ddvlad@gmail.com> <vlad.dogaru@intel.com> | |||
| 172 | Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com> | 172 | Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com> |
| 173 | Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com> | 173 | Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com> |
| 174 | Takashi YOSHII <takashi.yoshii.zj@renesas.com> | 174 | Takashi YOSHII <takashi.yoshii.zj@renesas.com> |
| 175 | Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com> | ||
| 175 | Yusuke Goda <goda.yusuke@renesas.com> | 176 | Yusuke Goda <goda.yusuke@renesas.com> |
| 176 | Gustavo Padovan <gustavo@las.ic.unicamp.br> | 177 | Gustavo Padovan <gustavo@las.ic.unicamp.br> |
| 177 | Gustavo Padovan <padovan@profusion.mobi> | 178 | Gustavo Padovan <padovan@profusion.mobi> |