kernel-fxtec-pro1x/drivers/net/wan
David S. Miller 8fd90bb889 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/infiniband/hw/cxgb4/device.c

The cxgb4 conflict was simply overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-07-22 00:44:59 -07:00
..
lmc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2014-01-25 11:17:34 -08:00
.gitignore
c101.c
cosa.c driver/net: cosa driver uses udelay incorrectly 2014-04-15 00:08:22 -04:00
cosa.h
dlci.c dlci: remove unnecessary break after return 2014-07-20 21:29:49 -07:00
dscc4.c wan: dscc4: remove unnecessary pci_set_drvdata() 2013-12-09 18:09:29 -05:00
farsync.c farsync: fix invalid memory accesses in fst_add_one() and fst_init_card() 2014-07-11 13:34:48 -07:00
farsync.h
hd64570.c drivers/net: delete non-required instances of include <linux/init.h> 2014-01-16 11:53:26 -08:00
hd64570.h net: Spelling s/transmition/transmission/ 2014-01-14 17:11:26 -08:00
hd64572.c drivers/net: delete non-required instances of include <linux/init.h> 2014-01-16 11:53:26 -08:00
hd64572.h net: Spelling s/transmition/transmission/ 2014-01-14 17:11:26 -08:00
hdlc.c net: set name_assign_type in alloc_netdev() 2014-07-15 16:12:48 -07:00
hdlc_cisco.c
hdlc_fr.c net: set name_assign_type in alloc_netdev() 2014-07-15 16:12:48 -07:00
hdlc_ppp.c
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
hostess_sv11.c net: wan: remove deprecated IRQF_DISABLED 2013-10-07 15:53:52 -04:00
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: set name_assign_type in alloc_netdev() 2014-07-15 16:12:48 -07:00
Makefile wanrouter: completely decouple obsolete code from kernel. 2013-01-31 19:20:33 -05:00
n2.c
pc300too.c wan: pc300too: remove unnecessary pci_set_drvdata() 2013-12-09 18:09:29 -05:00
pci200syn.c wan: pci200syn: remove unnecessary pci_set_drvdata() 2013-12-09 18:09:29 -05:00
sbni.c net: set name_assign_type in alloc_netdev() 2014-07-15 16:12:48 -07:00
sbni.h
sdla.c net: set name_assign_type in alloc_netdev() 2014-07-15 16:12:48 -07:00
sealevel.c net: wan: remove deprecated IRQF_DISABLED 2013-10-07 15:53:52 -04:00
wanxl.c wan: wanxl: remove unnecessary pci_set_drvdata() 2013-12-09 18:09:29 -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 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-07-22 00:44:59 -07:00
x25_asy.h wan: Remove extern from function prototypes 2013-09-24 16:40:19 -07:00
z85230.c sections: fix section conflicts in drivers/net/wan 2012-10-06 03:04:43 +09:00
z85230.h wan: Remove extern from function prototypes 2013-09-24 16:40:19 -07:00