| commit | 7cda4cee1366fae236678a5a6b124bab86b14973 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Tue Dec 05 10:44:19 2017 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Tue Dec 05 10:44:19 2017 -0500 |
| tree | 180bcb2d09e3db27050658afc36d5bac88593ed5 | |
| parent | a3fde2addd5f0218b64102005a237ef727b0dc30 [diff] | |
| parent | 2391f0b4808e3d5af348324d69f5f45c56a26836 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
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>