-
git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller authored
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>
7cda4cee
