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

Conflicts:
	net/ipv4/fib_frontend.c

2010-12-26 22:37:05 -08:00

..

lmc

drivers/net: return operator cleanup

2010-09-26 18:34:29 -07:00

.gitignore

…

c101.c

…

cosa.c

net: Wan/cosa.c: Convert "mutex" to semaphore

2010-10-12 17:36:09 +02:00

cosa.h

…

cycx_drv.c

…

cycx_main.c

…

cycx_x25.c

…

dlci.c

drivers/net: return operator cleanup

2010-09-26 18:34:29 -07:00

dscc4.c

drivers/net/*/: Use static const

2010-12-21 02:16:10 -08:00

farsync.c

…

farsync.h

…

hd64570.c

…

hd64570.h

…

hd64572.c

WAN: Fix a TX IRQ causing BUG() in PC300 and PCI200SYN drivers.

2010-12-12 15:03:00 -08:00

hd64572.h

…

hdlc_cisco.c

…

hdlc_fr.c

…

hdlc_ppp.c

…

hdlc_raw_eth.c

…

hdlc_raw.c

…

hdlc_x25.c

…

hdlc.c

…

hostess_sv11.c

…

ixp4xx_hss.c

…

Kconfig

Update broken web addresses in the kernel.

2010-10-18 11:03:14 +02:00

lapbether.c

…

Makefile

…

n2.c

drivers/net: return operator cleanup

2010-09-26 18:34:29 -07:00

pc300_drv.c

drivers/net: return operator cleanup

2010-09-26 18:34:29 -07:00

pc300_tty.c

drivers/net: return operator cleanup

2010-09-26 18:34:29 -07:00

pc300-falc-lh.h

…

pc300.h

…

pc300too.c

…

pci200syn.c

…

sbni.c

…

sbni.h

…

sdla.c

drivers/net: return operator cleanup

2010-09-26 18:34:29 -07:00

sealevel.c

…

wanxl.c

…

wanxl.h

…

wanxlfw.inc_shipped

…

wanxlfw.S

…

x25_asy.c

Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

2010-12-02 12:58:16 -08:00

x25_asy.h

…

z85230.c

…

z85230.h

…