David S. Miller a1744d3bee Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:

	drivers/net/wireless/p54/p54common.c

2008-10-31 00:17:34 -07:00

..

lmc

lmc: copy_*_user under spinlock

2008-10-16 05:11:00 -04:00

.gitignore

…

c101.c

…

cosa.c

device create: net: convert device_create_drvdata to device_create

2008-10-16 09:24:43 -07:00

cosa.h

…

cycx_drv.c

drivers/net: replace __FUNCTION__ with __func__

2008-09-24 18:59:00 -04:00

cycx_main.c

…

cycx_x25.c

drivers/net: replace __FUNCTION__ with __func__

2008-09-24 18:59:00 -04:00

dlci.c

…

dscc4.c

pci: use pci_ioremap_bar() in drivers/net

2008-10-31 00:53:48 -04:00

farsync.c

…

farsync.h

…

hd6457x.c

…

hd64570.h

…

hd64572.h

…

hdlc_cisco.c

…

hdlc_fr.c

…

hdlc_ppp.c

…

hdlc_raw_eth.c

…

hdlc_raw.c

…

hdlc_x25.c

wan/hdlc_x25.c: fix a NULL dereference

2008-09-24 18:49:02 -04:00

hdlc.c

…

hostess_sv11.c

…

Kconfig

tty: kref the tty driver object

2008-10-13 09:51:42 -07:00

lapbether.c

…

Makefile

…

n2.c

…

pc300_drv.c

…

pc300_tty.c

drivers/net: replace __FUNCTION__ with __func__

2008-09-24 18:59:00 -04:00

pc300-falc-lh.h

…

pc300.h

…

pc300too.c

pci: use pci_ioremap_bar() in drivers/net

2008-10-31 00:53:48 -04:00

pci200syn.c

pci: use pci_ioremap_bar() in drivers/net

2008-10-31 00:53:48 -04:00

sbni.c

drivers/net: use nr_irqs

2008-10-16 16:52:05 +02:00

sbni.h

…

sdla.c

…

sealevel.c

…

syncppp.c

drivers/net/wan/syncppp: Fix unused-var warnings

2008-10-27 15:06:51 -04:00

wanxl.c

…

wanxl.h

…

wanxlfw.inc_shipped

…

wanxlfw.S

…

x25_asy.c

…

x25_asy.h

…

z85230.c

net: delete excess kernel-doc notation

2008-10-30 23:54:35 -07:00

z85230.h

net: Rationalise email address: Network Specific Parts

2008-10-13 19:01:08 -07:00