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

Skip to content
Commit e1955342 authored by Paul Mundt's avatar Paul Mundt
Browse files

Merge branch 'sh/stable-updates'



Conflicts:
	arch/sh/kernel/dwarf.c
	drivers/dma/shdma.c

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parents 35f6cd4a 83515bc7
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment