linux/drivers/net/ethernet/3com
Jakub Kicinski 44a8c4f33c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
We got slightly different patches removing a double word
in a comment in net/ipv4/raw.c - picked the version from net.

Simple conflict in drivers/net/ethernet/ibm/ibmvnic.c. Use cached
values instead of VNIC login response buffer (following what
commit 507ebe6444 ("ibmvnic: Fix use-after-free of VNIC login
response buffer") did).

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2020-09-04 21:28:59 -07:00
..
3c59x.c docs: networking: reorganize driver documentation again 2020-06-26 16:08:44 -07:00
3c509.c treewide: Use fallthrough pseudo-keyword 2020-08-23 17:36:59 -05:00
3c515.c drivers: Remove inclusion of vermagic header 2020-04-21 13:27:37 -07:00
3c574_cs.c treewide: Use fallthrough pseudo-keyword 2020-08-23 17:36:59 -05:00
3c589_cs.c net/3com: Delete driver and module versions from 3com drivers 2020-02-24 11:23:36 -08:00
Kconfig docs: networking: reorganize driver documentation again 2020-06-26 16:08:44 -07:00
Makefile License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
typhoon.c typhoon: switch from 'pci_' to 'dma_' API 2020-08-24 17:33:11 -07:00
typhoon.h net: typhoon: Add required whitespace after keywords 2020-03-23 22:10:28 -07:00