David S. Miller 1b63ba8a86 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/wireless/iwlwifi/iwl4965-base.c		2008-06-28 01:19:40 -07:00
..
3c574_cs.c	3c574_cs: use netstats in net_device structure	2008-05-13 01:35:24 -04:00
3c589_cs.c	3c589_cs: use netstats in net_device structure	2008-05-13 01:35:24 -04:00
axnet_cs.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-06-28 01:19:40 -07:00
com20020_cs.c	some kmalloc/memset ->kzalloc (tree wide)	2007-07-19 10:04:50 -07:00
fmvj18x_cs.c	fmvj18x_cs: add NextCom NC5310 rev B support	2008-05-22 14:08:56 -04:00
ibmtr_cs.c	some kmalloc/memset ->kzalloc (tree wide)	2007-07-19 10:04:50 -07:00
Kconfig
Makefile
nmclan_cs.c	pcmcia: replace kio_addr_t with unsigned int everywhere	2008-02-05 09:44:08 -08:00
ositech.h
pcnet_cs.c	pcnet_cs, axnet_cs: clear bogus interrupt before request_irq	2008-06-27 01:28:21 -04:00
smc91c92_cs.c	Fix station address detection in smc	2008-02-15 10:51:37 -05:00
xirc2ps_cs.c	xirc2ps_cs: re-initialize the multicast address in do_reset	2008-05-22 14:08:50 -04:00