0c1072ae02
Conflicts: drivers/net/ethernet/freescale/fec_main.c drivers/net/ethernet/renesas/sh_eth.c net/ipv4/gre.c The GRE conflict is between a bug fix (kfree_skb --> kfree_skb_list) and the splitting of the gre.c code into seperate files. The FEC conflict was two sets of changes adding ethtool support code in an "!CONFIG_M5272" CPP protected block. Finally the sh_eth.c conflict was between one commit add bits set in the .eesr_err_check mask whilst another commit removed the .tx_error_check member and assignments. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
|---|---|---|
| .. | ||
| lmc | ||
| .gitignore | ||
| Kconfig | ||
| Makefile | ||
| c101.c | ||
| cosa.c | ||
| cosa.h | ||
| dlci.c | ||
| dscc4.c | ||
| farsync.c | ||
| farsync.h | ||
| hd64570.c | ||
| hd64570.h | ||
| hd64572.c | ||
| hd64572.h | ||
| hdlc.c | ||
| hdlc_cisco.c | ||
| hdlc_fr.c | ||
| hdlc_ppp.c | ||
| hdlc_raw.c | ||
| hdlc_raw_eth.c | ||
| hdlc_x25.c | ||
| hostess_sv11.c | ||
| ixp4xx_hss.c | ||
| lapbether.c | ||
| n2.c | ||
| pc300too.c | ||
| pci200syn.c | ||
| sbni.c | ||
| sbni.h | ||
| sdla.c | ||
| sealevel.c | ||
| wanxl.c | ||
| wanxl.h | ||
| wanxlfw.S | ||
| wanxlfw.inc_shipped | ||
| x25_asy.c | ||
| x25_asy.h | ||
| z85230.c | ||
| z85230.h | ||