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

Conflicts:

	drivers/net/cpmac.c
	net/mac80211/mlme.c

2008-05-25 23:26:10 -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

axnet_cs: use netstats in net_device structure

2008-05-13 01:35:23 -04: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

Fix Kconfig dependency problems wrt boolean menuconfigs

2007-06-28 11:34:53 -07:00

Makefile

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

nmclan_cs.c

pcmcia: replace kio_addr_t with unsigned int everywhere

2008-02-05 09:44:08 -08:00

ositech.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

pcnet_cs.c

pcnet_cs: if AX88190-based card, printk "use axnet_cs instead" message.

2008-02-23 23:56:55 -05: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