linux/drivers/net/wan
David S. Miller c3fa32b976 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/usb/qmi_wwan.c
	include/net/dst.h

Trivial merge conflicts, both were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-10-23 16:49:34 -04:00
..
lmc
.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
farsync.c farsync: fix info leak in ioctl 2013-10-11 17:50:59 -04:00
farsync.h
hd64570.c
hd64570.h
hd64572.c
hd64572.h
hdlc.c net: pass info struct via netdevice notifier 2013-05-28 13:11:01 -07:00
hdlc_cisco.c
hdlc_fr.c
hdlc_ppp.c
hdlc_raw.c
hdlc_raw_eth.c
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
lapbether.c net: pass info struct via netdevice notifier 2013-05-28 13:11:01 -07:00
Makefile
n2.c
pc300too.c
pci200syn.c
sbni.c net: wan: sbni: Fix incorrect placement of __initdata 2013-08-09 13:24:26 -07:00
sbni.h
sdla.c
sealevel.c net: wan: remove deprecated IRQF_DISABLED 2013-10-07 15:53:52 -04:00
wanxl.c wanxl: fix info leak in ioctl 2013-10-18 16:04:25 -04:00
wanxl.h
wanxlfw.inc_shipped
wanxlfw.S
x25_asy.c
x25_asy.h wan: Remove extern from function prototypes 2013-09-24 16:40:19 -07:00
z85230.c
z85230.h wan: Remove extern from function prototypes 2013-09-24 16:40:19 -07:00