mirror of
https://github.com/torvalds/linux.git
synced 2026-05-11 17:44:22 -04:00
Small overlapping change conflict ('net' changed a line,
'net-next' added a line right afterwards) in flexcan.c
Signed-off-by: David S. Miller <davem@davemloft.net>