diff options
| author | David S. Miller <davem@davemloft.net> | 2020-03-26 02:58:11 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-03-26 02:58:11 +0100 |
| commit | 9fb16955fb661945ddffce4504dcffbe55cd518a (patch) | |
| tree | e0811476a96a9411686e24f15a48d63cc6d02e49 /net/can/af_can.c | |
| parent | cxgb4: Add support to catch bits set in INT_CAUSE5 (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff) | |
| download | linux-9fb16955fb661945ddffce4504dcffbe55cd518a.tar.xz linux-9fb16955fb661945ddffce4504dcffbe55cd518a.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Overlapping header include additions in macsec.c
A bug fix in 'net' overlapping with the removal of 'version'
string in ena_netdev.c
Overlapping test additions in selftests Makefile
Overlapping PCI ID table adjustments in iwlwifi driver.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/can/af_can.c')
0 files changed, 0 insertions, 0 deletions