AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-02-08 08:05:11 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity
b633353115
linux_dsm_epyc7002/drivers/net/wireless/intel
History
David S. Miller b633353115 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/phy/bcm7xxx.c
	drivers/net/phy/marvell.c
	drivers/net/vxlan.c

All three conflicts were cases of simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-02-23 00:09:14 -05:00
..
ipw2x00 ipw2x00: add checks for dma mapping errors 2016-01-07 11:18:50 +02:00
iwlegacy iwlegacy: 4965-mac: constify il_sensitivity_ranges structure 2016-01-07 11:09:58 +02:00
iwlwifi Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-02-23 00:09:14 -05:00
Kconfig
Makefile