mirror of
https://github.com/LineageOS/android_kernel_fxtec_sm6115.git
synced 2026-08-22 22:21:17 +00:00
Conflicts: net/dsa/slave.c net/dsa/slave.c simply had overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>