Two minor conflicts in virtio_net driver (bug fix overlapping addition of a helper) and MAINTAINERS (new driver edit overlapping revamp of PHY entry). Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
rtl8xxxu | ||
rtl818x | ||
rtlwifi | ||
Kconfig | ||
Makefile |