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

drivers/net: fix up function prototypes after __dev* removals

2012-12-07 14:22:22 -05:00

.gitignore

…

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

farsync: fix info leak in ioctl

2013-10-11 17:50:59 -04: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

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_eth.c

net: replace random_ether_addr() with eth_hw_addr_random()

2012-02-15 15:34:16 -05:00

hdlc_raw.c

…

hdlc_x25.c

wan: make LAPB callbacks const

2011-09-16 19:20:20 -04:00

hdlc.c

net: pass info struct via netdevice notifier

2013-05-28 13:11:01 -07:00

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: 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

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

net: wan: sbni: Fix incorrect placement of __initdata

2013-08-09 13:24:26 -07:00

sbni.h

…

sdla.c

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

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

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

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