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

Conflicts:

	drivers/net/smc911x.c

2008-06-13 20:52:39 -07:00

..

6pack.c

6pack: use netstats in net_device structure

2008-05-13 01:35:24 -04:00

baycom_epp.c

net: Eliminate flush_scheduled_work() calls while RTNL is held.

2008-06-12 02:22:02 -07:00

baycom_par.c

…

baycom_ser_fdx.c

…

baycom_ser_hdx.c

…

bpqether.c

…

dmascc.c

…

hdlcdrv.c

…

Kconfig

…

Makefile

…

mkiss.c

…

scc.c

hamradio/scc: add missing block braces to multi-statement if

2008-05-22 06:03:31 -04:00

yam1200.h

…

yam9600.h

…

yam.c

…

z8530.h

…