David S. Miller 5b9ab2ec04 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/hp-plus.c drivers/net/wireless/ath5k/base.c drivers/net/wireless/ath9k/recv.c net/wireless/reg.c		2008-11-26 23:48:40 -08:00
..
3c574_cs.c	drivers/net: Kill now superfluous ->last_rx stores.	2008-11-03 21:11:17 -08:00
3c589_cs.c	drivers/net: Kill now superfluous ->last_rx stores.	2008-11-03 21:11:17 -08:00
Kconfig	[netdrvr] ibmtr: PCMCIA IBMTR is ok on 64bit	2008-10-16 05:40:16 -04:00
Makefile	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
axnet_cs.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-11-26 23:48:40 -08:00
com20020_cs.c	netdevice: safe convert to netdev_priv() #part-2	2008-11-12 23:38:14 -08:00
fmvj18x_cs.c	fmvj18x_cs: write interrupt ack bit for lan and modem to work simultaneously.	2008-11-07 03:21:10 -05:00
ibmtr_cs.c	pcmcia: deprecate CS_SUCCESS	2008-08-23 02:29:26 +02:00
nmclan_cs.c	drivers/net: Kill now superfluous ->last_rx stores.	2008-11-03 21:11:17 -08:00
ositech.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
pcnet_cs.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-11-26 23:48:40 -08:00
smc91c92_cs.c	net: convert print_mac to %pM	2008-10-27 17:06:18 -07:00
xirc2ps_cs.c	drivers/net: Kill now superfluous ->last_rx stores.	2008-11-03 21:11:17 -08:00