David S. Miller 0c1072ae02 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... 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>		2013-07-03 14:55:13 -07:00
..
lmc	drivers/net: fix up function prototypes after __dev* removals	2012-12-07 14:22:22 -05:00
.gitignore
c101.c
cosa.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-02-26 20:16:07 -08:00
cosa.h
dlci.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-07-03 14:55:13 -07:00
dscc4.c	drivers/net: fix up function prototypes after __dev* removals	2012-12-07 14:22:22 -05:00
farsync.c	wan: Remove unnecessary alloc/OOM messages	2013-02-04 13:22:34 -05:00
farsync.h
hd64570.c	drivers/net: fix up function prototypes after __dev* removals	2012-12-07 14:22:22 -05:00
hd64570.h
hd64572.c	drivers/net: fix up function prototypes after __dev* removals	2012-12-07 14:22:22 -05:00
hd64572.h
hdlc_cisco.c
hdlc_fr.c
hdlc_ppp.c
hdlc_raw_eth.c
hdlc_raw.c
hdlc_x25.c
hdlc.c	net: pass info struct via netdevice notifier	2013-05-28 13:11:01 -07:00
hostess_sv11.c
ixp4xx_hss.c	net: wan: remove unnecessary platform_set_drvdata()	2013-05-27 22:34:52 -07:00
Kconfig	tty/serial patches for 3.9-rc1	2013-02-21 13:41:04 -08:00
lapbether.c	net: pass info struct via netdevice notifier	2013-05-28 13:11:01 -07:00
Makefile	wanrouter: completely decouple obsolete code from kernel.	2013-01-31 19:20:33 -05:00
n2.c
pc300too.c	drivers/net: fix up function prototypes after __dev* removals	2012-12-07 14:22:22 -05:00
pci200syn.c	drivers/net: fix up function prototypes after __dev* removals	2012-12-07 14:22:22 -05:00
sbni.c
sbni.h
sdla.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
sealevel.c
wanxl.c	drivers/net: fix up function prototypes after __dev* removals	2012-12-07 14:22:22 -05:00
wanxl.h
wanxlfw.inc_shipped
wanxlfw.S	Fix the wanxl firmware to include missing constants	2012-11-09 16:28:37 -05:00
x25_asy.c	wan: Remove unnecessary alloc/OOM messages	2013-02-04 13:22:34 -05:00
x25_asy.h
z85230.c	sections: fix section conflicts in drivers/net/wan	2012-10-06 03:04:43 +09:00
z85230.h