mirror of
https://github.com/LineageOS/android_kernel_fxtec_sm6115.git
synced 2026-06-28 06:44:56 +00:00
All conflicts were trivial overlapping changes, so reasonably easy to resolve. Signed-off-by: David S. Miller <davem@davemloft.net>