mirror of
https://github.com/torvalds/linux.git
synced 2024-12-23 03:11:46 +00:00
68aaf44595
Minor conflict in r8169, bug fix had two versions in net and net-next, take the net-next hunks. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
rt2x00 | ||
Kconfig | ||
Makefile |