+17
−0
+10
−0
+24
−13
Loading
Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more
This resolves a merge issue with:
drivers/misc/mei/init.c
Signed-off-by:
Greg Kroah-Hartman <gregkh@linuxfoundation.org>