openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/drivers/net/wan
History
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
…
Kconfig tty/serial patches for 3.9-rc1 2013-02-21 13:41:04 -08:00
Makefile wanrouter: completely decouple obsolete code from kernel. 2013-01-31 19:20:33 -05:00
c101.c drivers/net: Remove unnecessary k.alloc/v.alloc OOM messages 2012-01-31 16:20:21 -05:00
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.c net: pass info struct via netdevice notifier 2013-05-28 13:11:01 -07:00
hdlc_cisco.c generic_hdlc: Update to current logging forms 2011-06-27 00:09:46 -07:00
hdlc_fr.c net: replace random_ether_addr() with eth_hw_addr_random() 2012-02-15 15:34:16 -05:00
hdlc_ppp.c net/wan/hdlc_ppp: use break in switch 2011-08-22 11:30:38 -07:00
hdlc_raw.c
…
hdlc_raw_eth.c net: replace random_ether_addr() with eth_hw_addr_random() 2012-02-15 15:34:16 -05:00
hdlc_x25.c wan: make LAPB callbacks const 2011-09-16 19:20:20 -04:00
hostess_sv11.c wan: Update to current logging forms 2011-06-27 00:09:47 -07:00
ixp4xx_hss.c net: wan: remove unnecessary platform_set_drvdata() 2013-05-27 22:34:52 -07:00
lapbether.c net: pass info struct via netdevice notifier 2013-05-28 13:11:01 -07:00
n2.c drivers/net: Remove unnecessary k.alloc/v.alloc OOM messages 2012-01-31 16:20:21 -05:00
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 module_param: make bool parameters really bool (net & drivers/net) 2011-12-19 22:27:29 -05:00
sbni.h
…
sdla.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
sealevel.c module_param: make bool parameters really bool (net & drivers/net) 2011-12-19 22:27:29 -05:00
wanxl.c drivers/net: fix up function prototypes after __dev* removals 2012-12-07 14:22:22 -05:00
wanxl.h
…
wanxlfw.S Fix the wanxl firmware to include missing constants 2012-11-09 16:28:37 -05:00
wanxlfw.inc_shipped
…
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
…