David S. Miller 577f99c1d0 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/wireless/rt2x00/rt2x00dev.c net/8021q/vlan_dev.c		2008-03-18 00:37:55 -07:00
..
lmc	annotate the rest of drivers/net/wan	2008-01-28 15:07:58 -08:00
.gitignore	…
Kconfig	…
Makefile	…
c101.c	…
cosa.c	COSA/SRP: convert channel_data.rsem to mutex	2008-03-05 18:53:01 -08:00
cosa.h	…
cycx_drv.c	Spelling fixes: lenght->length	2008-02-03 15:42:53 +02:00
cycx_main.c	…
cycx_x25.c	…
dlci.c	…
dscc4.c	dscc4 endian fixes	2008-01-18 14:44:32 -05:00
farsync.c	wan/farsync: copy_from_user() to iomem is wrong	2008-03-17 07:56:29 -04:00
farsync.h	…
hd6457x.c	…
hd64570.h	…
hd64572.h	…
hdlc.c	Generic HDLC - remove now unneeded hdlc_device_desc	2008-02-05 13:31:39 -05:00
hdlc_cisco.c	Generic HDLC - remove now unneeded hdlc_device_desc	2008-02-05 13:31:39 -05:00
hdlc_fr.c	Generic HDLC - use random_ether_addr()	2008-02-05 13:31:40 -05:00
hdlc_ppp.c	Generic HDLC - remove now unneeded hdlc_device_desc	2008-02-05 13:31:39 -05:00
hdlc_raw.c	Generic HDLC - remove now unneeded hdlc_device_desc	2008-02-05 13:31:39 -05:00
hdlc_raw_eth.c	Generic HDLC - use random_ether_addr()	2008-02-05 13:31:40 -05:00
hdlc_x25.c	Generic HDLC - remove now unneeded hdlc_device_desc	2008-02-05 13:31:39 -05:00
hostess_sv11.c	…
lapbether.c	…
n2.c	…
pc300-falc-lh.h	…
pc300.h	…
pc300_drv.c	NULL noise in drivers/net	2008-01-28 15:07:12 -08:00
pc300_tty.c	NULL noise in drivers/net	2008-01-28 15:07:12 -08:00
pc300too.c	…
pci200syn.c	…
sbni.c	net: replace __inline with inline	2008-03-05 18:36:28 -08:00
sbni.h	sbni endian fixes	2008-01-18 14:44:33 -05:00
sdla.c	[netdrvr] irq handler minor cleanups in several drivers	2008-01-28 15:03:40 -08:00
sealevel.c	…
syncppp.c	…
wanxl.c	annotate the rest of drivers/net/wan	2008-01-28 15:07:58 -08:00
wanxl.h	…
wanxlfw.S	…
wanxlfw.inc_shipped	…
x25_asy.c	x25_asy.c: silence compiler warning	2008-02-09 23:27:01 -08:00
x25_asy.h	…
z85230.c	…
z85230.h	…