+22
−0
Loading
Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more
This resolves a merge issue with drivers/staging/cxt1e1/linux.c that was fixed in a report from Stephen Rothwell Reported-by:Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by:
Greg Kroah-Hartman <gregkh@linuxfoundation.org>