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

Commit b397f825 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 5.1-rc3 into staging-next 



We want those fixes and this resolves an erofs merge conflict.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents b6008019 79a3aaa7

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -224,3 +224,5 @@ Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com> 
Yusuke Goda <goda.yusuke@renesas.com>

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

Gustavo Padovan <padovan@profusion.mobi>

Changbin Du <changbin.du@intel.com> <changbin.du@intel.com>

Changbin Du <changbin.du@intel.com> <changbin.du@gmail.com>