mirror of
https://github.com/torvalds/linux.git
synced 2024-11-20 11:01:38 +00:00
87ffabb1f0
The dwmac-socfpga.c conflict was a case of a bug fix overlapping changes in net-next to handle an error pointer differently. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
|---|---|---|
| .. | ||
| benet | ||
| Kconfig | ||
| Makefile | ||